diff --git a/dojo-typings/readme.md b/dojo-typings/readme.md
new file mode 100644
--- /dev/null
+++ b/dojo-typings/readme.md
@@ -0,0 +1,33 @@
+# dojo-typings
+
+This project is forked from the original `dojo-typings` package to
+improve it with more tight and customizable type definitions.
+
+The primary aims are
+
+* Parametrize collections with items type.
+* Distinguish sync and async methods in stores.
+* Parametrize widget typings with event and attribute maps.
+
+## Changes
+
+### 1.0.1
+
+Maintenance release
+
+* `NodeList-fx` added overloads to all methods to distinguish returned values
+  of different types (`Animation | this`).
+* Added missing signatures to `NodeList` constructor
+* Improved `dijit.form._FormWidgetMixin`
+* Added module declarations `dijit/form/_FormWidgetMixin`,
+  `dijit/form/_FormValueMixin`, `dijit/_HasDropDown`
+
+### 1.0.0
+
+Initial release
+
+* Parametrized `dojo/Stateful`, `diji/_WidgetBase`
+* split `dojo.store.api.Store` in two `SyncStore` and `AsyncStore` interfaces
+  * `dojo/store/Memory` implements `SyncStore` and can be used synchronously,
+  * `dojo/store/Rest` implements `AsyncStore` and all its methods are
+    returning explicit promises.
diff --git a/dojo-typings/src/main/typings/dijit/form.d.ts b/dojo-typings/src/main/typings/dijit/form.d.ts
--- a/dojo-typings/src/main/typings/dijit/form.d.ts
+++ b/dojo-typings/src/main/typings/dijit/form.d.ts
@@ -1,1889 +1,1868 @@
 declare namespace dijit {
 
-	namespace form {
+    namespace form {
 
-		/* implied */
+        /* implied */
 
-		interface Constraints {
-			[prop: string]: any;
-		}
+        interface Constraints {
+            [prop: string]: any;
+        }
 
-		interface ConstrainedValueFunction<V = any, C extends Constraints = Constraints, T = any> {
-			/**
-			 * Returns a value that has been constrained by the constraints
-			 * @param   value       The value to constrain
-			 * @param   constraints The constraints to use
-			 * @returns             The constrained value
-			 */
-			(value: V, constraints: C): T;
-		}
+        interface ConstrainedValueFunction<V = any, C extends Constraints = Constraints, T = any> {
+            /**
+             * Returns a value that has been constrained by the constraints
+             * @param   value       The value to constrain
+             * @param   constraints The constraints to use
+             * @returns             The constrained value
+             */
+            (value: V, constraints: C): T;
+        }
 
-		interface ConstrainedValidFunction<C extends Constraints = Constraints> {
-			/**
-			 * Returns true if the value is valid based on the constraints, otherwise
-			 * returns false.
-			 * @param   value       The value to check
-			 * @param   constraints The constraints to use
-			 * @returns             true if valid, otherwise false
-			 */
-			(value: any, constraints: C): boolean;
-		}
+        interface ConstrainedValidFunction<C extends Constraints = Constraints> {
+            /**
+             * Returns true if the value is valid based on the constraints, otherwise
+             * returns false.
+             * @param   value       The value to check
+             * @param   constraints The constraints to use
+             * @returns             true if valid, otherwise false
+             */
+            (value: any, constraints: C): boolean;
+        }
 
-		interface ConstraintsToRegExpString<C extends Constraints = Constraints> {
-			/**
-			 * Takes a set of constraints and returns a RegExpString that can be used
-			 * to match values against
-			 * @param   constraints The constraints to use
-			 * @returns             The RegExpString that represents the constraints
-			 */
-			(constraints: C): string;
-		}
+        interface ConstraintsToRegExpString<C extends Constraints = Constraints> {
+            /**
+             * Takes a set of constraints and returns a RegExpString that can be used
+             * to match values against
+             * @param   constraints The constraints to use
+             * @returns             The RegExpString that represents the constraints
+             */
+            (constraints: C): string;
+        }
 
-		interface SerializationFunction {
-			(val: any, options?: Object): string;
-		}
+        interface SerializationFunction {
+            (val: any, options?: Object): string;
+        }
 
-		/* dijit/form/_AutoCompleterMixin */
+        /* dijit/form/_AutoCompleterMixin */
 
-		/* tslint:disable:class-name */
-		interface _AutoCompleterMixin<T extends Object = any, Q extends dojo.store.api.BaseQueryType = dojo.store.api.BaseQueryType, O extends dojo.store.api.QueryOptions = dojo.store.api.QueryOptions> extends _SearchMixin<T, Q, O> {
-			/**
-			 * This is the item returned by the dojo/store/api/Store implementation that
-			 * provides the data for this ComboBox, it's the currently selected item.
-			 */
-			item: T;
+        /* tslint:disable:class-name */
+        interface _AutoCompleterMixin<T extends Object = any, Q extends dojo.store.api.BaseQueryType = dojo.store.api.BaseQueryType, O extends dojo.store.api.QueryOptions = dojo.store.api.QueryOptions> extends _SearchMixin<T, Q, O> {
+            /**
+             * This is the item returned by the dojo/store/api/Store implementation that
+             * provides the data for this ComboBox, it's the currently selected item.
+             */
+            item: T;
 
-			/**
-			 * If user types in a partial string, and then tab out of the `<input>` box,
-			 * automatically copy the first entry displayed in the drop down list to
-			 * the `<input>` field
-			 */
-			autoComplete: boolean;
+            /**
+             * If user types in a partial string, and then tab out of the `<input>` box,
+             * automatically copy the first entry displayed in the drop down list to
+             * the `<input>` field
+             */
+            autoComplete: boolean;
 
-			/**
-			 * One of: "first", "all" or "none".
-			 */
-			highlightMatch: string;
-			/* TODO: Uncomment for TS 1.8 and remove above */
-			/* highlightMatch: 'fisrt' | 'all' | 'none'; */
+            /**
+             * One of: "first", "all" or "none".
+             */
+            highlightMatch: string;
+            /* TODO: Uncomment for TS 1.8 and remove above */
+            /* highlightMatch: 'fisrt' | 'all' | 'none'; */
 
-			/**
-			 * The entries in the drop down list come from this attribute in the
-			 * dojo.data items.
-			 * If not specified, the searchAttr attribute is used instead.
-			 */
-			labelAttr: string;
+            /**
+             * The entries in the drop down list come from this attribute in the
+             * dojo.data items.
+             * If not specified, the searchAttr attribute is used instead.
+             */
+            labelAttr: string;
 
-			/**
-			 * Specifies how to interpret the labelAttr in the data store items.
-			 * Can be "html" or "text".
-			 */
-			labelType: string;
+            /**
+             * Specifies how to interpret the labelAttr in the data store items.
+             * Can be "html" or "text".
+             */
+            labelType: string;
 
-			/**
-			 * Flags to _HasDropDown to limit height of drop down to make it fit in viewport
-			 */
-			maxHeight: number;
+            /**
+             * Flags to _HasDropDown to limit height of drop down to make it fit in viewport
+             */
+            maxHeight: number;
 
-			/**
-			 * For backwards compatibility let onClick events propagate, even clicks on the down arrow button
-			 */
-			_stopClickEvents: boolean;
+            /**
+             * For backwards compatibility let onClick events propagate, even clicks on the down arrow button
+             */
+            _stopClickEvents: boolean;
 
-			_getCaretPos(element: HTMLElement): number;
-			_setCaretPos(element: HTMLElement, location: number): void;
+            _getCaretPos(element: HTMLElement): number;
+            _setCaretPos(element: HTMLElement, location: number): void;
 
-			/**
-			 * Overrides _HasDropDown.loadDropDown().
-			 */
-			loadDropDown(loadCallback: () => void): void;
+            /**
+             * Overrides _HasDropDown.loadDropDown().
+             */
+            loadDropDown(loadCallback: () => void): void;
 
-			/**
-			 * signal to _HasDropDown that it needs to call loadDropDown() to load the
-			 * drop down asynchronously before displaying it
-			 */
-			isLoaded(): boolean;
+            /**
+             * signal to _HasDropDown that it needs to call loadDropDown() to load the
+             * drop down asynchronously before displaying it
+             */
+            isLoaded(): boolean;
 
-			/**
-			 * Overrides _HasDropDown.closeDropDown().  Closes the drop down (assuming that it's open).
-			 * This method is the callback when the user types ESC or clicking
-			 * the button icon while the drop down is open.  It's also called by other code.
-			 */
-			closeDropDown(focus?: boolean): void;
+            /**
+             * Overrides _HasDropDown.closeDropDown().  Closes the drop down (assuming that it's open).
+             * This method is the callback when the user types ESC or clicking
+             * the button icon while the drop down is open.  It's also called by other code.
+             */
+            closeDropDown(focus?: boolean): void;
 
-			postMixInProperties(): void;
-			postCreate(): void;
+            postMixInProperties(): void;
+            postCreate(): void;
 
-			/**
-			 * Highlights the string entered by the user in the menu.  By default this
-			 * highlights the first occurrence found. Override this method
-			 * to implement your custom highlighting.
-			 */
-			doHighlight(label: string, find: string): string;
-			reset(): void;
-			labelFunc(item: T, store: dojo.store.api.Store<T, Q, O>): string;
+            /**
+             * Highlights the string entered by the user in the menu.  By default this
+             * highlights the first occurrence found. Override this method
+             * to implement your custom highlighting.
+             */
+            doHighlight(label: string, find: string): string;
+            reset(): void;
+            labelFunc(item: T, store: dojo.store.api.Store<T, Q, O>): string;
 
-			// set(name: 'value', value: string): this;
-			// set(name: 'item', value: T): this;
-			// set(name: 'disabled', value: boolean): this;
-			// set(name: string, value: any): this;
-			// set(values: Object): this;
-		}
+            // set(name: 'value', value: string): this;
+            // set(name: 'item', value: T): this;
+            // set(name: 'disabled', value: boolean): this;
+            // set(name: string, value: any): this;
+            // set(values: Object): this;
+        }
 
-		/* dijit/form/_ButtonMixin */
+        /* dijit/form/_ButtonMixin */
 
-		interface _ButtonMixin {
-			/**
-			 * A mixin to add a thin standard API wrapper to a normal HTML button
-			 */
-			label: string;
+        interface _ButtonMixin {
+            /**
+             * A mixin to add a thin standard API wrapper to a normal HTML button
+             */
+            label: string;
 
-			/**
-			 * Type of button (submit, reset, button, checkbox, radio)
-			 */
-			type: string;
-			postCreate(): void;
+            /**
+             * Type of button (submit, reset, button, checkbox, radio)
+             */
+            type: string;
+            postCreate(): void;
 
-			/**
-			 * Callback for when button is clicked.
-			 * If type="submit", return true to perform submit, or false to cancel it.
-			 */
-			onClick(e: MouseEvent): boolean | void;
-			onSetLabel(e: Event): void;
-		}
+            /**
+             * Callback for when button is clicked.
+             * If type="submit", return true to perform submit, or false to cancel it.
+             */
+            onClick(e: MouseEvent): boolean | void;
+            onSetLabel(e: Event): void;
+        }
 
-		/* dijit/form/_CheckBoxMixin */
+        /* dijit/form/_CheckBoxMixin */
 
-		interface _CheckBoxMixin {
-			/**
-			 * type attribute on `<input>` node.
-			 * Overrides `dijit/form/Button.type`.  Users should not change this value.
-			 */
-			type: string;
+        interface _CheckBoxMixin {
+            /**
+             * type attribute on `<input>` node.
+             * Overrides `dijit/form/Button.type`.  Users should not change this value.
+             */
+            type: string;
 
-			/**
-			 * As an initialization parameter, equivalent to value field on normal checkbox
-			 * (if checked, the value is passed as the value when form is submitted).
-			 */
-			value: string;
+            /**
+             * As an initialization parameter, equivalent to value field on normal checkbox
+             * (if checked, the value is passed as the value when form is submitted).
+             */
+            value: string;
 
-			/**
-			 * Should this widget respond to user input?
-			 * In markup, this is specified as "readOnly".
-			 * Similar to disabled except readOnly form values are submitted.
-			 */
-			readOnly: boolean;
+            /**
+             * Should this widget respond to user input?
+             * In markup, this is specified as "readOnly".
+             * Similar to disabled except readOnly form values are submitted.
+             */
+            readOnly: boolean;
 
-			reset: () => void;
-		}
+            reset: () => void;
+        }
 
-		/* dijit/form/_ComboBoxMenu */
+        /* dijit/form/_ComboBoxMenu */
 
-		interface _ComboBoxMenu<T = any> extends _WidgetBase, _TemplatedMixin, _ListMouseMixin, _ComboBoxMenuMixin<T> {
-			templateString: string;
-			baseClass: string;
+        interface _ComboBoxMenu<T = any> extends _WidgetBase, _TemplatedMixin, _ListMouseMixin, _ComboBoxMenuMixin<T> {
+            templateString: string;
+            baseClass: string;
 
-			/**
-			 * Add hover CSS
-			 */
-			onHover(node: HTMLElement): void;
+            /**
+             * Add hover CSS
+             */
+            onHover(node: HTMLElement): void;
 
-			/**
-			 * Remove hover CSS
-			 */
-			onUnhover(node: HTMLElement): void;
+            /**
+             * Remove hover CSS
+             */
+            onUnhover(node: HTMLElement): void;
 
-			/**
-			 * Add selected CSS
-			 */
-			onSelect(node: HTMLElement): void;
+            /**
+             * Add selected CSS
+             */
+            onSelect(node: HTMLElement): void;
 
-			/**
-			 * Remove selected CSS
-			 */
-			onDeselect(node: HTMLElement): void;
+            /**
+             * Remove selected CSS
+             */
+            onDeselect(node: HTMLElement): void;
 
-			/**
-			 * Handles page-up and page-down keypresses
-			 */
-			_page(up?: boolean): void;
+            /**
+             * Handles page-up and page-down keypresses
+             */
+            _page(up?: boolean): void;
 
-			/**
-			 * Handle keystroke event forwarded from ComboBox, returning false if it's
-			 * a keystroke I recognize and process, true otherwise.
-			 */
-			handleKey(evt: KeyboardEvent): boolean;
+            /**
+             * Handle keystroke event forwarded from ComboBox, returning false if it's
+             * a keystroke I recognize and process, true otherwise.
+             */
+            handleKey(evt: KeyboardEvent): boolean;
 
-			// set(name: string, value: any): this;
-			// set(values: Object): this;
-		}
+            // set(name: string, value: any): this;
+            // set(values: Object): this;
+        }
 
-		interface _ComboBoxMenuConstructor extends _WidgetBaseConstructor<_ComboBoxMenu<any>> {
-			new <T = any>(params: Object, srcNodeRef: dojo.NodeOrString): _ComboBoxMenu<T>;
-		}
+        interface _ComboBoxMenuConstructor extends _WidgetBaseConstructor<_ComboBoxMenu<any>> {
+            new <T = any>(params: Object, srcNodeRef: dojo.NodeOrString): _ComboBoxMenu<T>;
+        }
 
-		/* dijit/form/_ComboBoxMenuMixin */
+        /* dijit/form/_ComboBoxMenuMixin */
 
-		interface _ComboBoxMenuMixin<T = any> {
-			/**
-			 * Holds "next" and "previous" text for paging buttons on drop down
-			 */
-			_messages: { next: string; previous: string; };
-
-			onClick(node: HTMLElement): void;
+        interface _ComboBoxMenuMixin<T = any> {
+            /**
+             * Holds "next" and "previous" text for paging buttons on drop down
+             */
+            _messages: { next: string; previous: string; };
 
-			/**
-			 * Notifies ComboBox/FilteringSelect that user selected an option.
-			 */
-			onChange(direction: number): void;
+            onClick(node: HTMLElement): void;
 
-			/**
-			 * Notifies ComboBox/FilteringSelect that user clicked to advance to next/previous page.
-			 */
-			onPage(direction: number): void;
+            /**
+             * Notifies ComboBox/FilteringSelect that user selected an option.
+             */
+            onChange(direction: number): void;
 
-			/**
-			 * Callback from dijit.popup code to this widget, notifying it that it closed
-			 */
-			onClose(): void;
+            /**
+             * Notifies ComboBox/FilteringSelect that user clicked to advance to next/previous page.
+             */
+            onPage(direction: number): void;
 
-			/**
-			 * Fills in the items in the drop down list
-			 */
-			createOptions(results: T[], options: dojo.store.api.QueryOptions, labelFunc: (item: T) => { html: boolean; label: string; }): void;
+            /**
+             * Callback from dijit.popup code to this widget, notifying it that it closed
+             */
+            onClose(): void;
 
-			/**
-			 * Clears the entries in the drop down list, but of course keeps the previous and next buttons.
-			 */
-			clearResultList(): void;
+            /**
+             * Fills in the items in the drop down list
+             */
+            createOptions(results: T[], options: dojo.store.api.QueryOptions, labelFunc: (item: T) => { html: boolean; label: string; }): void;
 
-			/**
-			 * Highlight the first real item in the list (not Previous Choices).
-			 */
-			highlightFirstOption(): void;
+            /**
+             * Clears the entries in the drop down list, but of course keeps the previous and next buttons.
+             */
+            clearResultList(): void;
 
-			/**
-			 * Highlight the last real item in the list (not More Choices).
-			 */
-			highlightLastOption(): void;
+            /**
+             * Highlight the first real item in the list (not Previous Choices).
+             */
+            highlightFirstOption(): void;
+
+            /**
+             * Highlight the last real item in the list (not More Choices).
+             */
+            highlightLastOption(): void;
 
-			selectFirstNode(): void;
-			selectLastNode(): void;
-			getHighlightedOption(): HTMLElement;
+            selectFirstNode(): void;
+            selectLastNode(): void;
+            getHighlightedOption(): HTMLElement;
 
-			// set(name: 'value', value: Object): this;
-			// set(name: string, value: any): this;
-			// set(values: Object): this;
-		}
+            // set(name: 'value', value: Object): this;
+            // set(name: string, value: any): this;
+            // set(values: Object): this;
+        }
 
-		/* dijit/form/_DateTimeTextBox */
+        /* dijit/form/_DateTimeTextBox */
 
-		interface DateTimeConstraints extends Constraints, dojo.date.DateLocaleFormatOptions { }
+        interface DateTimeConstraints extends Constraints, dojo.date.DateLocaleFormatOptions { }
 
-		interface _DateTimeTextBox<T extends _WidgetBase> extends RangeBoundTextBox, _HasDropDown<T> {
-			templateString: string;
+        interface _DateTimeTextBox<T extends _WidgetBase> extends RangeBoundTextBox, _HasDropDown<T> {
+            templateString: string;
 
-			/**
-			 * Set this textbox to display a down arrow button, to open the drop down list.
-			 */
-			hasDownArrow: boolean;
-			cssStateNodes: CSSStateNodes;
+            /**
+             * Set this textbox to display a down arrow button, to open the drop down list.
+             */
+            hasDownArrow: boolean;
+            cssStateNodes: CSSStateNodes;
 
-			/**
-			 * Despite the name, this parameter specifies both constraints on the input
-			 * (including starting/ending dates/times allowed) as well as
-			 * formatting options like whether the date is displayed in long (ex: December 25, 2005)
-			 * or short (ex: 12/25/2005) format.  See `dijit/form/_DateTimeTextBox.__Constraints` for details.
-			 */
-			constraints: DateTimeConstraints;
+            /**
+             * Despite the name, this parameter specifies both constraints on the input
+             * (including starting/ending dates/times allowed) as well as
+             * formatting options like whether the date is displayed in long (ex: December 25, 2005)
+             * or short (ex: 12/25/2005) format.  See `dijit/form/_DateTimeTextBox.__Constraints` for details.
+             */
+            constraints: DateTimeConstraints;
 
-			/**
-			 * The constraints without the min/max properties. Used by the compare() method
-			 */
-			_unboundedConstraints: DateTimeConstraints;
+            /**
+             * The constraints without the min/max properties. Used by the compare() method
+             */
+            _unboundedConstraints: DateTimeConstraints;
 
-			pattern: (options?: dojo.date.DateLocaleFormatOptions | RangeBoundTextBoxConstraints) => string;
+            pattern: (options?: dojo.date.DateLocaleFormatOptions | RangeBoundTextBoxConstraints) => string;
 
-			/**
-			 * JavaScript namespace to find calendar routines.	 If unspecified, uses Gregorian calendar routines
-			 * at dojo/date and dojo/date/locale.
-			 */
-			datePackage: string;
+            /**
+             * JavaScript namespace to find calendar routines.	 If unspecified, uses Gregorian calendar routines
+             * at dojo/date and dojo/date/locale.
+             */
+            datePackage: string;
 
-			postMixInProperties(): void;
-			compare(val1: Date, val2: Date): number;
-			autoWidth: boolean;
+            postMixInProperties(): void;
+            compare(val1: Date, val2: Date): number;
+            autoWidth: boolean;
 
-			/**
-			 * Formats the value as a Date, according to specified locale (second argument)
-			 */
-			format: ConstrainedValueFunction<Date, DateTimeConstraints, string>;
+            /**
+             * Formats the value as a Date, according to specified locale (second argument)
+             */
+            format: ConstrainedValueFunction<Date, DateTimeConstraints, string>;
 
-			/**
-			 * Parses as string as a Date, according to constraints
-			 */
-			parse: ConstrainedValueFunction<string, DateTimeConstraints, Date>;
+            /**
+             * Parses as string as a Date, according to constraints
+             */
+            parse: ConstrainedValueFunction<string, DateTimeConstraints, Date>;
 
-			serialize(val: any, options?: dojo.date.StampFormatOptions): string;
+            serialize(val: any, options?: dojo.date.StampFormatOptions): string;
 
-			/**
-			 * The default value to focus in the popupClass widget when the textbox value is empty.
-			 */
-			dropDownDefaultValue: Date;
+            /**
+             * The default value to focus in the popupClass widget when the textbox value is empty.
+             */
+            dropDownDefaultValue: Date;
 
-			/**
-			 * The value of this widget as a JavaScript Date object.  Use get("value") / set("value", val) to manipulate.
-			 * When passed to the parser in markup, must be specified according to `dojo/date/stamp.fromISOString()`
-			 */
-			value: Date;
+            /**
+             * The value of this widget as a JavaScript Date object.  Use get("value") / set("value", val) to manipulate.
+             * When passed to the parser in markup, must be specified according to `dojo/date/stamp.fromISOString()`
+             */
+            value: Date;
 
-			_blankValue: string;
+            _blankValue: string;
 
-			/**
-			 * Name of the popup widget class used to select a date/time.
-			 * Subclasses should specify this.
-			 */
-			popupClass: string | _WidgetBaseConstructor<T>;
+            /**
+             * Name of the popup widget class used to select a date/time.
+             * Subclasses should specify this.
+             */
+            popupClass: string | _WidgetBaseConstructor<T>;
 
-			/**
-			 * Specifies constraints.selector passed to dojo.date functions, should be either
-			 * "date" or "time".
-			 * Subclass must specify this.
-			 */
-			_selector: string;
-			/* TODO: uncomment for TS 1.8 */
-			/* _selector: 'data' | 'time'; */
+            /**
+             * Specifies constraints.selector passed to dojo.date functions, should be either
+             * "date" or "time".
+             * Subclass must specify this.
+             */
+            _selector: string;
+            /* TODO: uncomment for TS 1.8 */
+            /* _selector: 'data' | 'time'; */
 
-			buildRendering(): void;
+            buildRendering(): void;
 
-			/**
-			 * Runs various tests on the value, checking for invalid conditions
-			 */
-			_isInvalidDate(value: Date): boolean;
+            /**
+             * Runs various tests on the value, checking for invalid conditions
+             */
+            _isInvalidDate(value: Date): boolean;
 
-			// get(name: 'displayedValue'): string;
-			// get(name: string): any;
+            // get(name: 'displayedValue'): string;
+            // get(name: string): any;
 
-			// set(name: 'displayedValue', value: string): this;
-			// set(name: 'dropDownDefaultValue', value: Date): this;
-			// set(name: 'value', value: Date | string): this;
-			// set(name: 'constraints', value: DateTimeConstraints): this;
-			// set(name: string, value: any): this;
-			// set(values: Object): this;
-		}
-
-		interface _DateTimeTextBoxConstructor<T extends _WidgetBase> extends _WidgetBaseConstructor<_DateTimeTextBox<T>> { }
+            // set(name: 'displayedValue', value: string): this;
+            // set(name: 'dropDownDefaultValue', value: Date): this;
+            // set(name: 'value', value: Date | string): this;
+            // set(name: 'constraints', value: DateTimeConstraints): this;
+            // set(name: string, value: any): this;
+            // set(values: Object): this;
+        }
 
-		/* dijit/form/_ExpandingTextAreaMixin */
+        interface _DateTimeTextBoxConstructor<T extends _WidgetBase> extends _WidgetBaseConstructor<_DateTimeTextBox<T>> { }
+
+        /* dijit/form/_ExpandingTextAreaMixin */
 
-		interface _ExpandingTextAreaMixin {
-			postCreate(): void;
-			startup(): void;
-			resize(): void;
-		}
+        interface _ExpandingTextAreaMixin {
+            postCreate(): void;
+            startup(): void;
+            resize(): void;
+        }
 
-		/* dijit/form/_FormMixin */
-
-		interface OnValidStateChange {
-			(isValid?: boolean): void;
-		}
+        /* dijit/form/_FormMixin */
 
-		interface _FormMixin {
+        interface OnValidStateChange {
+            (isValid?: boolean): void;
+        }
+
+        interface _FormMixin {
 
-			/**
-			 * Will be "Error" if one or more of the child widgets has an invalid value,
-			 * "Incomplete" if not all of the required child widgets are filled in.  Otherwise, "",
-			 * which indicates that the form is ready to be submitted.
-			 */
-			state: '' | 'Error' | 'Incomplete';
+            /**
+             * Will be "Error" if one or more of the child widgets has an invalid value,
+             * "Incomplete" if not all of the required child widgets are filled in.  Otherwise, "",
+             * which indicates that the form is ready to be submitted.
+             */
+            state: '' | 'Error' | 'Incomplete';
 
-			/**
-			 * Returns all form widget descendants, searching through non-form child widgets like BorderContainer
-			 */
-			_getDescendantFormWidgets(children?: _WidgetBase[]): _FormWidget[];
-
-			reset(): void;
+            /**
+             * Returns all form widget descendants, searching through non-form child widgets like BorderContainer
+             */
+            _getDescendantFormWidgets(children?: _WidgetBase[]): _FormWidget[];
 
-			/**
-			 * returns if the form is valid - same as isValid - but
-			 * provides a few additional (ui-specific) features:
-			 *
-			 * 1. it will highlight any sub-widgets that are not valid
-			 * 2. it will call focus() on the first invalid sub-widget
-			 */
-			validate(): boolean;
+            reset(): void;
 
-			setValues(val: any): _FormMixin;
-			getValues(): any;
+            /**
+             * returns if the form is valid - same as isValid - but
+             * provides a few additional (ui-specific) features:
+             *
+             * 1. it will highlight any sub-widgets that are not valid
+             * 2. it will call focus() on the first invalid sub-widget
+             */
+            validate(): boolean;
+
+            setValues(val: any): _FormMixin;
+            getValues(): any;
 
-			/**
-			 * Returns true if all of the widgets are valid.
-			 * Deprecated, will be removed in 2.0.  Use get("state") instead.
-			 */
-			isValid(): boolean;
+            /**
+             * Returns true if all of the widgets are valid.
+             * Deprecated, will be removed in 2.0.  Use get("state") instead.
+             */
+            isValid(): boolean;
 
-			/**
-			 * Stub function to connect to if you want to do something
-			 * (like disable/enable a submit button) when the valid
-			 * state changes on the form as a whole.
-			 *
-			 * Deprecated.  Will be removed in 2.0.  Use watch("state", ...) instead.
-			 */
-			onValidStateChange: OnValidStateChange;
-
-			/**
-			 * Compute what this.state should be based on state of children
-			 */
-			_getState(): '' | 'Error' | 'Incomplete';
+            /**
+             * Stub function to connect to if you want to do something
+             * (like disable/enable a submit button) when the valid
+             * state changes on the form as a whole.
+             *
+             * Deprecated.  Will be removed in 2.0.  Use watch("state", ...) instead.
+             */
+            onValidStateChange: OnValidStateChange;
 
-			/**
-			 * Deprecated method.   Applications no longer need to call this.   Remove for 2.0.
-			 */
-			disconnectChildren(): void;
+            /**
+             * Compute what this.state should be based on state of children
+             */
+            _getState(): '' | 'Error' | 'Incomplete';
 
-			/**
-			 * You can call this function directly, ex. in the event that you
-			 * programmatically add a widget to the form *after* the form has been
-			 * initialized.
-			 */
-			connectChildren(inStartup?: boolean): void;
+            /**
+             * Deprecated method.   Applications no longer need to call this.   Remove for 2.0.
+             */
+            disconnectChildren(): void;
 
-			/**
-			 * Called when child's value or disabled state changes
-			 */
-			_onChildChange(attr?: string): void;
-
-			startup(): void;
-			destroy(preserveDom?: boolean): void;
-		}
+            /**
+             * You can call this function directly, ex. in the event that you
+             * programmatically add a widget to the form *after* the form has been
+             * initialized.
+             */
+            connectChildren(inStartup?: boolean): void;
 
-		interface _FormMixinConstructor extends dojo._base.DeclareConstructor<_FormMixin> { }
-
-		/* dijit/form/_FormSelectWidget */
+            /**
+             * Called when child's value or disabled state changes
+             */
+            _onChildChange(attr?: string): void;
 
-		interface SelectOption {
-			value?: string;
-			label: string;
-			selected?: boolean;
-			disabled?: boolean;
-		}
+            startup(): void;
+            destroy(preserveDom?: boolean): void;
+        }
+
+        interface _FormMixinConstructor extends dojo._base.DeclareConstructor<_FormMixin> { }
+
+        /* dijit/form/_FormSelectWidget */
 
-		interface _FormSelectWidget<T extends Object, Q extends dojo.store.api.BaseQueryType = dojo.store.api.BaseQueryType, O extends dojo.store.api.QueryOptions = dojo.store.api.QueryOptions> extends _FormValueWidget {
-			/**
-			 * Whether or not we are multi-valued
-			 */
-			multiple: boolean;
+        interface SelectOption {
+            value?: string;
+            label: string;
+            selected?: boolean;
+            disabled?: boolean;
+        }
 
-			/**
-			 * The set of options for our select item.  Roughly corresponds to
-			 * the html `<option>` tag.
-			 */
-			options: SelectOption[];
+        interface _FormSelectWidget<T extends Object, Q extends dojo.store.api.BaseQueryType = dojo.store.api.BaseQueryType, O extends dojo.store.api.QueryOptions = dojo.store.api.QueryOptions> extends _FormValueWidget {
+            /**
+             * Whether or not we are multi-valued
+             */
+            multiple: boolean;
 
-			/**
-			 * A store to use for getting our list of options - rather than reading them
-			 * from the `<option>` html tags.   Should support getIdentity().
-			 * For back-compat store can also be a dojo/data/api/Identity.
-			 */
-			store: dojo.store.api.Store<T, Q, O>;
+            /**
+             * The set of options for our select item.  Roughly corresponds to
+             * the html `<option>` tag.
+             */
+            options: SelectOption[];
 
-			/**
-			 * A query to use when fetching items from our store
-			 */
-			query: Q;
+            /**
+             * A store to use for getting our list of options - rather than reading them
+             * from the `<option>` html tags.   Should support getIdentity().
+             * For back-compat store can also be a dojo/data/api/Identity.
+             */
+            store: dojo.store.api.Store<T, Q, O>;
 
-			/**
-			 * Query options to use when fetching from the store
-			 */
-			queryOptions: O;
+            /**
+             * A query to use when fetching items from our store
+             */
+            query: Q;
 
-			/**
-			 * The entries in the drop down list come from this attribute in the dojo.store items.
-			 * If ``store`` is set, labelAttr must be set too, unless store is an old-style
-			 * dojo.data store rather than a new dojo/store.
-			 */
-			labelAttr: string;
+            /**
+             * Query options to use when fetching from the store
+             */
+            queryOptions: O;
 
-			/**
-			 * A callback to do with an onFetch - but before any items are actually
-			 * iterated over (i.e. to filter even further what you want to add)
-			 */
-			onFetch: (items: T[]) => void;
+            /**
+             * The entries in the drop down list come from this attribute in the dojo.store items.
+             * If ``store`` is set, labelAttr must be set too, unless store is an old-style
+             * dojo.data store rather than a new dojo/store.
+             */
+            labelAttr: string;
 
-			/**
-			 * Flag to sort the options returned from a store by the label of
-			 * the store.
-			 */
-			sortByLabel: boolean;
+            /**
+             * A callback to do with an onFetch - but before any items are actually
+             * iterated over (i.e. to filter even further what you want to add)
+             */
+            onFetch: (items: T[]) => void;
+
+            /**
+             * Flag to sort the options returned from a store by the label of
+             * the store.
+             */
+            sortByLabel: boolean;
 
-			/**
-			 * By default loadChildren is called when the items are fetched from the
-			 * store.  This property allows delaying loadChildren (and the creation
-			 * of the options/menuitems) until the user clicks the button to open the
-			 * dropdown.
-			 */
-			loadChildrenOnOpen: boolean;
+            /**
+             * By default loadChildren is called when the items are fetched from the
+             * store.  This property allows delaying loadChildren (and the creation
+             * of the options/menuitems) until the user clicks the button to open the
+             * dropdown.
+             */
+            loadChildrenOnOpen: boolean;
 
-			/**
-			 * This is the `dojo.Deferred` returned by setStore().
-			 * Calling onLoadDeferred.then() registers your
-			 * callback to be called only once, when the prior setStore completes.
-			 */
-			onLoadDeferred: dojo.Deferred<void>;
+            /**
+             * This is the `dojo.Deferred` returned by setStore().
+             * Calling onLoadDeferred.then() registers your
+             * callback to be called only once, when the prior setStore completes.
+             */
+            onLoadDeferred: dojo.Deferred<void>;
 
-			/**
-			 * Returns a given option (or options).
-			 */
-			getOptions(valueOrIdx: string): SelectOption;
-			getOptions(valueOrIdx: number): SelectOption;
-			getOptions(valueOrIdx: SelectOption): SelectOption;
-			getOptions(valueOrIdx: (string | number | SelectOption)[]): SelectOption[];
-			getOptions(): SelectOption[];
+            /**
+             * Returns a given option (or options).
+             */
+            getOptions(valueOrIdx: string): SelectOption;
+            getOptions(valueOrIdx: number): SelectOption;
+            getOptions(valueOrIdx: SelectOption): SelectOption;
+            getOptions(valueOrIdx: (string | number | SelectOption)[]): SelectOption[];
+            getOptions(): SelectOption[];
 
-			/**
-			 * Adds an option or options to the end of the select.  If value
-			 * of the option is empty or missing, a separator is created instead.
-			 * Passing in an array of options will yield slightly better performance
-			 * since the children are only loaded once.
-			 */
-			addOption(option: SelectOption | SelectOption[]): void;
+            /**
+             * Adds an option or options to the end of the select.  If value
+             * of the option is empty or missing, a separator is created instead.
+             * Passing in an array of options will yield slightly better performance
+             * since the children are only loaded once.
+             */
+            addOption(option: SelectOption | SelectOption[]): void;
 
-			/**
-			 * Removes the given option or options.  You can remove by string
-			 * (in which case the value is removed), number (in which case the
-			 * index in the options array is removed), or select option (in
-			 * which case, the select option with a matching value is removed).
-			 * You can also pass in an array of those values for a slightly
-			 * better performance since the children are only loaded once.
-			 * For numeric option values, specify {value: number} as the argument.
-			 */
-			removeOption(option: string | number | SelectOption | (string | number | SelectOption)[]): void;
+            /**
+             * Removes the given option or options.  You can remove by string
+             * (in which case the value is removed), number (in which case the
+             * index in the options array is removed), or select option (in
+             * which case, the select option with a matching value is removed).
+             * You can also pass in an array of those values for a slightly
+             * better performance since the children are only loaded once.
+             * For numeric option values, specify {value: number} as the argument.
+             */
+            removeOption(option: string | number | SelectOption | (string | number | SelectOption)[]): void;
 
-			/**
-			 * Updates the values of the given option.  The option to update
-			 * is matched based on the value of the entered option.  Passing
-			 * in an array of new options will yield better performance since
-			 * the children will only be loaded once.
-			 */
-			updateOption(newOption: SelectOption | SelectOption[]): void;
+            /**
+             * Updates the values of the given option.  The option to update
+             * is matched based on the value of the entered option.  Passing
+             * in an array of new options will yield better performance since
+             * the children will only be loaded once.
+             */
+            updateOption(newOption: SelectOption | SelectOption[]): void;
 
-			/**
-			 * Deprecated!
-			 */
-			setStore(store: dojo.store.api.Store<T, Q, O>, selectedValue?: T, fetchArgs?: {
-				query: Q;
-				queryOptions: O;
-				onFetch: (items: T[], fetchArgs?: any) => void;
-			}): dojo.store.api.Store<T, Q, O>;
+            /**
+             * Deprecated!
+             */
+            setStore(store: dojo.store.api.Store<T, Q, O>, selectedValue?: T, fetchArgs?: {
+                query: Q;
+                queryOptions: O;
+                onFetch: (items: T[], fetchArgs?: any) => void;
+            }): dojo.store.api.Store<T, Q, O>;
 
-			/**
-			 * Sets the store you would like to use with this select widget.
-			 * The selected value is the value of the new store to set.  This
-			 * function returns the original store, in case you want to reuse
-			 * it or something.
-			 */
-			_deprecatedSetStore(store: dojo.store.api.Store<T, Q, O>, selectedValue?: T, fetchArgs?: {
-				query: Q;
-				queryOptions: O;
-				onFetch: (items: T[], fetchArgs?: any) => void;
-			}): dojo.store.api.Store<T, Q, O>;
+            /**
+             * Sets the store you would like to use with this select widget.
+             * The selected value is the value of the new store to set.  This
+             * function returns the original store, in case you want to reuse
+             * it or something.
+             */
+            _deprecatedSetStore(store: dojo.store.api.Store<T, Q, O>, selectedValue?: T, fetchArgs?: {
+                query: Q;
+                queryOptions: O;
+                onFetch: (items: T[], fetchArgs?: any) => void;
+            }): dojo.store.api.Store<T, Q, O>;
 
-			/**
-			 * Loads the children represented by this widget's options.
-			 * reset the menu to make it populatable on the next click
-			 */
-			_loadChildren(): void;
+            /**
+             * Loads the children represented by this widget's options.
+             * reset the menu to make it populatable on the next click
+             */
+            _loadChildren(): void;
 
-			/**
-			 * Sets the "selected" class on the item for styling purposes
-			 */
-			_updateSelection(): void;
+            /**
+             * Sets the "selected" class on the item for styling purposes
+             */
+            _updateSelection(): void;
 
-			/**
-			 * Returns the value of the widget by reading the options for
-			 * the selected flag
-			 */
-			_getValueFromOpts(): string;
+            /**
+             * Returns the value of the widget by reading the options for
+             * the selected flag
+             */
+            _getValueFromOpts(): string;
 
-			buildRendering(): void;
+            buildRendering(): void;
 
-			/**
-			 * Loads our options and sets up our dropdown correctly.  We
-			 * don't want any content, so we don't call any inherit chain
-			 * function.
-			 */
-			_fillContent(): void;
+            /**
+             * Loads our options and sets up our dropdown correctly.  We
+             * don't want any content, so we don't call any inherit chain
+             * function.
+             */
+            _fillContent(): void;
 
-			/**
-			 * sets up our event handling that we need for functioning
-			 * as a select
-			 */
-			postCreate(): void;
+            /**
+             * sets up our event handling that we need for functioning
+             * as a select
+             */
+            postCreate(): void;
 
-			startup(): void;
+            startup(): void;
 
-			/**
-			 * Clean up our connections
-			 */
-			destroy(preserveDom?: boolean): void;
+            /**
+             * Clean up our connections
+             */
+            destroy(preserveDom?: boolean): void;
 
-			/**
-			 * User-overridable function which, for the given option, adds an
-			 * item to the select.  If the option doesn't have a value, then a
-			 * separator is added in that place.  Make sure to store the option
-			 * in the created option widget.
-			 */
-			_addOptionItem(option: SelectOption): void;
+            /**
+             * User-overridable function which, for the given option, adds an
+             * item to the select.  If the option doesn't have a value, then a
+             * separator is added in that place.  Make sure to store the option
+             * in the created option widget.
+             */
+            _addOptionItem(option: SelectOption): void;
 
-			/**
-			 * User-overridable function which, for the given option, removes
-			 * its item from the select.
-			 */
-			_removeOptionItem(option: SelectOption): void;
+            /**
+             * User-overridable function which, for the given option, removes
+             * its item from the select.
+             */
+            _removeOptionItem(option: SelectOption): void;
 
-			/**
-			 * Overridable function which will set the display for the
-			 * widget.  newDisplay is either a string (in the case of
-			 * single selects) or array of strings (in the case of multi-selects)
-			 */
-			_setDisplay(newDisplay: string | string[]): void;
+            /**
+             * Overridable function which will set the display for the
+             * widget.  newDisplay is either a string (in the case of
+             * single selects) or array of strings (in the case of multi-selects)
+             */
+            _setDisplay(newDisplay: string | string[]): void;
 
-			/**
-			 * Overridable function to return the children that this widget contains.
-			 */
-			_getChildren(): any[];
+            /**
+             * Overridable function to return the children that this widget contains.
+             */
+            _getChildren(): any[];
 
-			/**
-			 * hooks into this.attr to provide a mechanism for getting the
-			 * option items for the current value of the widget.
-			 */
-			_getSelectedOptionsAttr(): SelectOption[];
+            /**
+             * hooks into this.attr to provide a mechanism for getting the
+             * option items for the current value of the widget.
+             */
+            _getSelectedOptionsAttr(): SelectOption[];
 
-			/**
-			 * a function that will "fake" loading children, if needed, and
-			 * if we have set to not load children until the widget opens.
-			 */
-			_pseudoLoadChildren(items: T[]): void;
+            /**
+             * a function that will "fake" loading children, if needed, and
+             * if we have set to not load children until the widget opens.
+             */
+            _pseudoLoadChildren(items: T[]): void;
 
-			/**
-			 * a function that can be connected to in order to receive a
-			 * notification that the store has finished loading and all options
-			 * from that store are available
-			 */
-			onSetStore(): void;
-		}
+            /**
+             * a function that can be connected to in order to receive a
+             * notification that the store has finished loading and all options
+             * from that store are available
+             */
+            onSetStore(): void;
+        }
 
-		/* dijit/form/_FormValueMixin */
+        /* dijit/form/_FormValueMixin */
 
-		interface _FormValueMixin extends _FormWidgetMixin {
+        interface _FormValueMixin extends _FormWidgetMixin {
 
-			/**
-			 * Should this widget respond to user input?
-			 * In markup, this is specified as "readOnly".
-			 * Similar to disabled except readOnly form values are submitted.
-			 */
-			readOnly: boolean;
+            /**
+             * Should this widget respond to user input?
+             * In markup, this is specified as "readOnly".
+             * Similar to disabled except readOnly form values are submitted.
+             */
+            readOnly: boolean;
 
-			postCreate(): void;
+            postCreate(): void;
 
-			/**
-			 * Restore the value to the last value passed to onChange
-			 */
-			undo(): void;
+            /**
+             * Restore the value to the last value passed to onChange
+             */
+            undo(): void;
 
-			/**
-			 * Reset the widget's value to what it was at initialization time
-			 */
-			reset(): void;
-
-			_hasBeenBlurred?: boolean;
-		}
-
-		/* dijit/form/_FormValueWidget */
+            /**
+             * Reset the widget's value to what it was at initialization time
+             */
+            reset(): void;
 
-		interface _FormValueWidget extends _FormWidget, _FormValueMixin {
-			/**
-			 * Work around table sizing bugs on IE7 by forcing redraw
-			 */
-			_layoutHackIE7(): void;
+            _hasBeenBlurred?: boolean;
+        }
+
+        /* dijit/form/_FormValueWidget */
 
-			// set(name: string, value: any): this;
-			// set(values: Object): this;
-		}
-
-		interface _FormValueWidgetConstructor extends _WidgetBaseConstructor<_FormValueWidget> { }
-
-		/* dijit/form/_FormWidget */
+        interface _FormValueWidget extends _FormWidget, _FormValueMixin {
+            /**
+             * Work around table sizing bugs on IE7 by forcing redraw
+             */
+            _layoutHackIE7(): void;
 
-		interface _FormWidget extends _Widget, _TemplatedMixin, _CssStateMixin, _FormWidgetMixin {
-			setDisabled(disabled: boolean): void;
-			setValue(value: string): void;
-			postMixInProperties(): void;
+            // set(name: string, value: any): this;
+            // set(values: Object): this;
+        }
+
+        interface _FormValueWidgetConstructor extends _WidgetBaseConstructor<_FormValueWidget> { }
 
-			// set(name: 'value', value: string): this;
-			// set(name: string, value: any): this;
-			// set(values: Object): this;
-		}
+        /* dijit/form/_FormWidget */
 
-		interface _FormWidgetConstructor extends _WidgetBaseConstructor<_FormWidget> { }
-
-		/* dijit/form/_FormWidgetMixin */
+        interface _FormWidget extends _Widget, _TemplatedMixin, _CssStateMixin, _FormWidgetMixin {
+            setDisabled(disabled: boolean): void;
+            setValue(value: string): void;
+            postMixInProperties(): void;
 
-		interface _FormWidgetMixin {
-			/**
-			 * Name used when submitting form; same as "name" attribute or plain HTML elements
-			 */
-			name: string;
+            // set(name: 'value', value: string): this;
+            // set(name: string, value: any): this;
+            // set(values: Object): this;
+        }
 
-			/**
-			 * Corresponds to the native HTML `<input>` element's attribute.
-			 */
-			alt: string;
+        interface _FormWidgetConstructor extends _WidgetBaseConstructor<_FormWidget> { }
+
+        /* dijit/form/_FormWidgetMixin */
 
-			/**
-			 * Corresponds to the native HTML `<input>` element's attribute.
-			 */
-			value: any;
-
-			/**
-			 * Corresponds to the native HTML `<input>` element's attribute.
-			 */
-			type: string;
+        /**
+         * Mixin for widgets corresponding to native HTML elements such as `<checkbox>` or `<button>`,
+         * which can be children of a `<form>` node or a `dijit/form/Form` widget.
+         * 
+         * Represents a single HTML element.
+         * All these widgets should have these attributes just like native HTML input elements.
+         * You can set them during widget construction or afterwards, via `dijit/_WidgetBase.set()`.
+         * 
+         * They also share some common methods.
+         */
+        interface _FormWidgetMixin {
+            /**
+             * Name used when submitting form; same as "name" attribute or plain HTML elements
+             */
+            name: string;
 
-			/**
-			 * Apply aria-label in markup to the widget's focusNode
-			 */
-			'aria-label': string;
 
-			/**
-			 * Order fields are traversed when user hits the tab key
-			 */
-			tabIndex: number;
+            /** Corresponds to the native HTML `<input>` element's attribute. */
+            alt: string;
+
+            /** Corresponds to the native HTML `<input>` element's attribute. */
+            value: any;
 
-			/**
-			 * Should this widget respond to user input?
-			 * In markup, this is specified as "disabled='disabled'", or just "disabled".
-			 */
-			disabled: boolean;
+            /** Corresponds to the native HTML `<input>` element's attribute. */
+            type: string;
+
+            /** Apply aria-label in markup to the widget's focusNode */
+            "aria-label": "focusNode";
 
-			/**
-			 * Fires onChange for each value change or only on demand
-			 */
-			intermediateChanges: boolean;
+            /** Order fields are traversed when user hits the tab key */
+            tabIndex: number;
+
+            /** Should this widget respond to user input?
+             * In markup, this is specified as "disabled='disabled'", or just "disabled".
+             */
+            disabled: boolean;
 
-			/**
-			 * On focus, should this widget scroll into view?
-			 */
-			scrollOnFocus: boolean;
+            /** Fires onChange for each value change or only on demand */
+            intermediateChanges: boolean;
+
+            /** On focus, should this widget scroll into view? */
+            scrollOnFocus: boolean;
 
-			/**
-			 * Tells if this widget is focusable or not.  Used internally by dijit.
-			 */
-			isFocusable(): boolean;
+            _setDisabledAttr(value: boolean): void;
+
+            _onFocus(by: string): void;
 
-			/**
-			 * Put focus on this widget
-			 */
-			focus(): void;
+            /** Tells if this widget is focusable or not.  Used internally by dijit.
+             * @protected
+             */
+            isFocusable(): boolean;
 
-			/**
-			 * Compare 2 values (as returned by get('value') for this widget).
-			 */
-			compare(val1: any, val2: any): number;
+            /** Put focus on this widget */
+            focus(): void;
 
-			/**
-			 * Callback when this widget's value is changed.
-			 */
-			onChange(value: string): void;
+            /** Compare 2 values (as returned by get('value') for this widget).
+             * @protected
+             */
+            compare(val1: any, val2: any): number;
 
-			/**
-			 * Overrides _Widget.create()
-			 */
-			create(params?: any, srcNodeRef?: HTMLElement): void;
-
-			destroy(preserveDom?: boolean): void;
+            onChange(newValue: any): void;
 
-			// set(name: 'disabled', value: boolean): this;
-			// set(name: string, value: any): this;
-			// set(values: Object): this;
-		}
-
-		/* dijit/form/_ListBase */
+            /**
+         * Hook so set('value', value) works.
+         * 
+         * Sets the value of the widget.
+         * If the value has changed, then fire onChange event, unless priorityChange
+         * is specified as null (or false?)
+         * 
+         * @param value 
+         * @param priorityChange 
+         */
+            _setValueAttr(value: any, priorityChange?: boolean);
 
-		interface _ListBase {
-			/**
-			 * currently selected node
-			 */
-			selected: HTMLElement;
-
-			/**
-			 * Select the first displayed item in the list.
-			 */
-			selectFirstNode(): void;
+            /**
+             * Called when the value of the widget has changed.  Saves the new value in this.value,
+             * and calls onChange() if appropriate.   See _FormWidget._handleOnChange() for details.
+             * 
+             * @param newValue 
+             * @param priorityChange 
+             */
+            _handleOnChange(newValue: any, priorityChange?: boolean);
+        }
 
-			/**
-			 * Select the last displayed item in the list
-			 */
-			selectLastNode(): void;
+        /* dijit/form/_ListBase */
 
-			/**
-			 * Select the item just below the current selection.
-			 * If nothing selected, select first node.
-			 */
-			selectNextNode(): void;
+        interface _ListBase {
+            /**
+             * currently selected node
+             */
+            selected: HTMLElement;
 
-			/**
-			 * Select the item just above the current selection.
-			 * If nothing selected, select last node (if
-			 * you select Previous and try to keep scrolling up the list).
-			 */
-			selectPreviousNode(): void;
+            /**
+             * Select the first displayed item in the list.
+             */
+            selectFirstNode(): void;
 
-			// set(name: 'selected', value: HTMLElement): this;
-			// set(name: string, value: any): this;
-			// set(values: Object): this;
-		}
+            /**
+             * Select the last displayed item in the list
+             */
+            selectLastNode(): void;
 
-		/* dijit/form/_ListMouseMixin */
+            /**
+             * Select the item just below the current selection.
+             * If nothing selected, select first node.
+             */
+            selectNextNode(): void;
 
-		interface _ListMouseMixin extends _ListBase {
-			postCreate(): void;
-		}
-
-		/* dijit/form/_RadioButtonMixin */
+            /**
+             * Select the item just above the current selection.
+             * If nothing selected, select last node (if
+             * you select Previous and try to keep scrolling up the list).
+             */
+            selectPreviousNode(): void;
 
-		interface _RadioButtonMixin {
-			/**
-			 * type attribute on `<input>` node.
-			 * Users should not change this value.
-			 */
-			type: string;
-		}
+            // set(name: 'selected', value: HTMLElement): this;
+            // set(name: string, value: any): this;
+            // set(values: Object): this;
+        }
+
+        /* dijit/form/_ListMouseMixin */
 
-		/* dijit/form/_SearchMixin */
+        interface _ListMouseMixin extends _ListBase {
+            postCreate(): void;
+        }
+
+        /* dijit/form/_RadioButtonMixin */
 
-		interface _SearchMixin<T extends Object, Q extends dojo.store.api.BaseQueryType = dojo.store.api.BaseQueryType, O extends dojo.store.api.QueryOptions = dojo.store.api.QueryOptions> {
-			/**
-			 * Argument to data provider.
-			 * Specifies maximum number of search results to return per query
-			 */
-			pageSize: number;
+        interface _RadioButtonMixin {
+            /**
+             * type attribute on `<input>` node.
+             * Users should not change this value.
+             */
+            type: string;
+        }
 
-			/**
-			 * Reference to data provider object used by this ComboBox.
-			 * The store must accept an object hash of properties for its query. See `query` and `queryExpr` for details.
-			 */
-			store: dojo.store.api.Store<T, Q, O>;
+        /* dijit/form/_SearchMixin */
 
-			/**
-			 * Mixin to the store's fetch.
-			 * For example, to set the sort order of the ComboBox menu, pass:
-			 * { sort: [{attribute:"name",descending: true}] }
-			 * To override the default queryOptions so that deep=false, do:
-			 * { queryOptions: {ignoreCase: true, deep: false} }
-			 */
-			fetchProperties: { [property: string]: any };
+        interface _SearchMixin<T extends Object, Q extends dojo.store.api.BaseQueryType = dojo.store.api.BaseQueryType, O extends dojo.store.api.QueryOptions = dojo.store.api.QueryOptions> {
+            /**
+             * Argument to data provider.
+             * Specifies maximum number of search results to return per query
+             */
+            pageSize: number;
 
-			/**
-			 * A query that can be passed to `store` to initially filter the items.
-			 * ComboBox overwrites any reference to the `searchAttr` and sets it to the `queryExpr` with the user's input substituted.
-			 */
-			query: Q;
+            /**
+             * Reference to data provider object used by this ComboBox.
+             * The store must accept an object hash of properties for its query. See `query` and `queryExpr` for details.
+             */
+            store: dojo.store.api.Store<T, Q, O>;
 
-			/**
-			 * Alternate to specifying a store.  Id of a dijit/form/DataList widget.
-			 */
-			list: string;
+            /**
+             * Mixin to the store's fetch.
+             * For example, to set the sort order of the ComboBox menu, pass:
+             * { sort: [{attribute:"name",descending: true}] }
+             * To override the default queryOptions so that deep=false, do:
+             * { queryOptions: {ignoreCase: true, deep: false} }
+             */
+            fetchProperties: { [property: string]: any };
 
-			/**
-			 * Delay in milliseconds between when user types something and we start
-			 * searching based on that value
-			 */
-			searchDelay: number;
+            /**
+             * A query that can be passed to `store` to initially filter the items.
+             * ComboBox overwrites any reference to the `searchAttr` and sets it to the `queryExpr` with the user's input substituted.
+             */
+            query: Q;
 
-			/**
-			 * Search for items in the data store where this attribute (in the item)
-			 * matches what the user typed
-			 */
-			searchAttr: string;
+            /**
+             * Alternate to specifying a store.  Id of a dijit/form/DataList widget.
+             */
+            list: string;
 
-			/**
-			 * This specifies what query is sent to the data store,
-			 * based on what the user has typed.  Changing this expression will modify
-			 * whether the results are only exact matches, a "starting with" match,
-			 * etc.
-			 * `${0}` will be substituted for the user text.
-			 * `*` is used for wildcards.
-			 * `${0}*` means "starts with", `*${0}*` means "contains", `${0}` means "is"
-			 */
-			queryExpr: string;
+            /**
+             * Delay in milliseconds between when user types something and we start
+             * searching based on that value
+             */
+            searchDelay: number;
 
-			/**
-			 * Set true if the query should ignore case when matching possible items
-			 */
-			ignoreCase: boolean;
+            /**
+             * Search for items in the data store where this attribute (in the item)
+             * matches what the user typed
+             */
+            searchAttr: string;
 
-			/**
-			 * Helper function to convert a simple pattern to a regular expression for matching.
-			 */
-			_patternToRegExp(pattern: string): RegExp;
-
-			_abortQuery(): void;
+            /**
+             * This specifies what query is sent to the data store,
+             * based on what the user has typed.  Changing this expression will modify
+             * whether the results are only exact matches, a "starting with" match,
+             * etc.
+             * `${0}` will be substituted for the user text.
+             * `*` is used for wildcards.
+             * `${0}*` means "starts with", `*${0}*` means "contains", `${0}` means "is"
+             */
+            queryExpr: string;
 
-			/**
-			 * Handles input (keyboard/paste) events
-			 */
-			_processInput(e: KeyboardEvent): void;
+            /**
+             * Set true if the query should ignore case when matching possible items
+             */
+            ignoreCase: boolean;
 
-			/**
-			 * Callback when a search completes.
-			 */
-			onSearch(results: T[], query: Q, options: O): void;
-
-			_startSearchFromInput(): void;
+            /**
+             * Helper function to convert a simple pattern to a regular expression for matching.
+             */
+            _patternToRegExp(pattern: string): RegExp;
 
-			/**
-			 * Starts a search for elements matching text (text=="" means to return all items
-			 * and calls onSearch(...) when the search completes, to display the results.
-			 */
-			_startSearch(text: string): void;
+            _abortQuery(): void;
 
-			postMixInProperties(): void;
+            /**
+             * Handles input (keyboard/paste) events
+             */
+            _processInput(e: KeyboardEvent): void;
 
-			// set(name: 'list', value: string): this;
-			// set(name: string, value: any): this;
-			// set(values: Object): this;
-		}
+            /**
+             * Callback when a search completes.
+             */
+            onSearch(results: T[], query: Q, options: O): void;
 
-		/* dijit/form/_Spinner */
+            _startSearchFromInput(): void;
 
-		interface AdjustFunction {
-			(val: any, delta: number): any;
-		}
+            /**
+             * Starts a search for elements matching text (text=="" means to return all items
+             * and calls onSearch(...) when the search completes, to display the results.
+             */
+            _startSearch(text: string): void;
 
-		interface _Spinner extends RangeBoundTextBox {
-			/**
-			 * Number of milliseconds before a held arrow key or up/down button becomes typematic
-			 */
-			defaultTimeout: number;
+            postMixInProperties(): void;
 
-			/**
-			 * minimum number of milliseconds that typematic event fires when held key or button is held
-			 */
-			minimumTimeout: number;
+            // set(name: 'list', value: string): this;
+            // set(name: string, value: any): this;
+            // set(values: Object): this;
+        }
 
-			/**
-			 * Fraction of time used to change the typematic timer between events.
-			 * 1.0 means that each typematic event fires at defaultTimeout intervals.
-			 * Less than 1.0 means that each typematic event fires at an increasing faster rate.
-			 */
-			timeoutChangeRate: number;
+        /* dijit/form/_Spinner */
+
+        interface AdjustFunction {
+            (val: any, delta: number): any;
+        }
 
-			/**
-			 * Adjust the value by this much when spinning using the arrow keys/buttons
-			 */
-			smallDelta: number;
-
-			/**
-			 * Adjust the value by this much when spinning using the PgUp/Dn keys
-			 */
-			largeDelta: number;
+        interface _Spinner extends RangeBoundTextBox {
+            /**
+             * Number of milliseconds before a held arrow key or up/down button becomes typematic
+             */
+            defaultTimeout: number;
 
-			templateString: string;
-			baseClass: string;
-			cssStateNodes: CSSStateNodes;
+            /**
+             * minimum number of milliseconds that typematic event fires when held key or button is held
+             */
+            minimumTimeout: number;
 
-			/**
-			 * Overridable function used to adjust a primitive value(Number/Date/...) by the delta amount specified.
-			 * The val is adjusted in a way that makes sense to the object type.
-			 */
-			adjust: AdjustFunction;
+            /**
+             * Fraction of time used to change the typematic timer between events.
+             * 1.0 means that each typematic event fires at defaultTimeout intervals.
+             * Less than 1.0 means that each typematic event fires at an increasing faster rate.
+             */
+            timeoutChangeRate: number;
 
-			postCreate(): void;
-		}
-
-		interface _SpinnerConstrctor extends _WidgetBaseConstructor<_Spinner> { }
+            /**
+             * Adjust the value by this much when spinning using the arrow keys/buttons
+             */
+            smallDelta: number;
 
-		/* dijit/form/_TextBoxMixin */
-
-		interface _TextBoxMixin<C extends Constraints = Constraints> {
-			/**
-			 * Removes leading and trailing whitespace if true.  Default is false.
-			 */
-			trim: boolean;
+            /**
+             * Adjust the value by this much when spinning using the PgUp/Dn keys
+             */
+            largeDelta: number;
 
-			/**
-			 * Converts all characters to uppercase if true.  Default is false.
-			 */
-			uppercase: boolean;
+            templateString: string;
+            baseClass: string;
+            cssStateNodes: CSSStateNodes;
 
-			/**
-			 * Converts all characters to lowercase if true.  Default is false.
-			 */
-			lowercase: boolean;
+            /**
+             * Overridable function used to adjust a primitive value(Number/Date/...) by the delta amount specified.
+             * The val is adjusted in a way that makes sense to the object type.
+             */
+            adjust: AdjustFunction;
 
-			/**
-			 * Converts the first character of each word to uppercase if true.
-			 */
-			propercase: boolean;
+            postCreate(): void;
+        }
+
+        interface _SpinnerConstrctor extends _WidgetBaseConstructor<_Spinner> { }
+
+        /* dijit/form/_TextBoxMixin */
 
-			/**
-			 * HTML INPUT tag maxLength declaration.
-			 */
-			maxLength: string;
+        interface _TextBoxMixin<C extends Constraints = Constraints> {
+            /**
+             * Removes leading and trailing whitespace if true.  Default is false.
+             */
+            trim: boolean;
 
-			/**
-			 * If true, all text will be selected when focused with mouse
-			 */
-			selectOnClick: boolean;
-
-			/**
-			 * Defines a hint to help users fill out the input field (as defined in HTML 5).
-			 * This should only contain plain text (no html markup).
-			 */
-			placeHolder: string;
+            /**
+             * Converts all characters to uppercase if true.  Default is false.
+             */
+            uppercase: boolean;
 
-			/**
-			 * For subclasses like ComboBox where the displayed value
-			 * (ex: Kentucky) and the serialized value (ex: KY) are different,
-			 * this represents the displayed value.
-			 *
-			 * Setting 'displayedValue' through set('displayedValue', ...)
-			 * updates 'value', and vice-versa.  Otherwise 'value' is updated
-			 * from 'displayedValue' periodically, like onBlur etc.
-			 */
-			displayedValue: string;
+            /**
+             * Converts all characters to lowercase if true.  Default is false.
+             */
+            lowercase: boolean;
+
+            /**
+             * Converts the first character of each word to uppercase if true.
+             */
+            propercase: boolean;
 
-			/**
-			 * Replaceable function to convert a value to a properly formatted string.
-			 */
-			format: ConstrainedValueFunction<any, C, any>;
+            /**
+             * HTML INPUT tag maxLength declaration.
+             */
+            maxLength: string;
+
+            /**
+             * If true, all text will be selected when focused with mouse
+             */
+            selectOnClick: boolean;
 
-			/**
-			 * Replaceable function to convert a formatted string to a value
-			 */
-			parse: ConstrainedValueFunction<any, C, any>;
-
-			/**
-			 * Connect to this function to receive notifications of various user data-input events.
-			 * Return false to cancel the event and prevent it from being processed.
-			 * Note that although for historical reasons this method is called `onInput()`, it doesn't
-			 * correspond to the standard DOM "input" event, because it occurs before the input has been processed.
-			 */
-			onInput(e: InputEvent): void;
+            /**
+             * Defines a hint to help users fill out the input field (as defined in HTML 5).
+             * This should only contain plain text (no html markup).
+             */
+            placeHolder: string;
 
-			postCreate(): void;
-
-			/**
-			 * if the textbox is blank, what value should be reported
-			 */
-			_blankValue: string;
+            /**
+             * For subclasses like ComboBox where the displayed value
+             * (ex: Kentucky) and the serialized value (ex: KY) are different,
+             * this represents the displayed value.
+             *
+             * Setting 'displayedValue' through set('displayedValue', ...)
+             * updates 'value', and vice-versa.  Otherwise 'value' is updated
+             * from 'displayedValue' periodically, like onBlur etc.
+             */
+            displayedValue: string;
 
-			/**
-			 * Auto-corrections (such as trimming) that are applied to textbox
-			 * value on blur or form submit.
-			 */
-			filter<T>(val: T): T;
-			filter<T extends number>(value: T): T;
+            /**
+             * Replaceable function to convert a value to a properly formatted string.
+             */
+            format: ConstrainedValueFunction<any, C, any>;
+
+            /**
+             * Replaceable function to convert a formatted string to a value
+             */
+            parse: ConstrainedValueFunction<any, C, any>;
 
-			_setBlurValue(): void;
+            /**
+             * Connect to this function to receive notifications of various user data-input events.
+             * Return false to cancel the event and prevent it from being processed.
+             * Note that although for historical reasons this method is called `onInput()`, it doesn't
+             * correspond to the standard DOM "input" event, because it occurs before the input has been processed.
+             */
+            onInput(e: InputEvent): void;
 
-			reset(): void;
-		}
-
-		/* dijit/form/_ToggleButtonMixin */
+            postCreate(): void;
 
-		interface _ToggleButtonMixin {
-			/**
-			 * Corresponds to the native HTML `<input>` element's attribute.
-			 * In markup, specified as "checked='checked'" or just "checked".
-			 * True if the button is depressed, or the checkbox is checked,
-			 * or the radio button is selected, etc.
-			 */
-			checked: boolean;
+            /**
+             * if the textbox is blank, what value should be reported
+             */
+            _blankValue: string;
 
-			postCreate(): void;
+            /**
+             * Auto-corrections (such as trimming) that are applied to textbox
+             * value on blur or form submit.
+             */
+            filter<T>(val: T): T;
+            filter<T extends number>(value: T): T;
 
-			/**
-			 * Reset the widget's value to what it was at initialization time
-			 */
-			reset(): void;
+            _setBlurValue(): void;
 
-			_hasBeenBlurred?: boolean;
-		}
+            reset(): void;
+        }
 
-		/* dijit/form/Button */
+        /* dijit/form/_ToggleButtonMixin */
 
-		interface Button extends _FormWidget, _ButtonMixin {
-			/**
-			 * Set this to true to hide the label text and display only the icon.
-			 * (If showLabel=false then iconClass must be specified.)
-			 * Especially useful for toolbars.
-			 * If showLabel=true, the label will become the title (a.k.a. tooltip/hint)
-			 */
-			showLabel: boolean;
+        interface _ToggleButtonMixin {
+            /**
+             * Corresponds to the native HTML `<input>` element's attribute.
+             * In markup, specified as "checked='checked'" or just "checked".
+             * True if the button is depressed, or the checkbox is checked,
+             * or the radio button is selected, etc.
+             */
+            checked: boolean;
 
-			/**
-			 * Class to apply to DOMNode in button to make it display an icon
-			 */
-			iconClass: string;
+            postCreate(): void;
 
-			baseClass: string;
-			templateString: string;
-			postCreate(): void;
-			setLabel(content: string): void;
-			onLabelSet(e: Event): void;
+            /**
+             * Reset the widget's value to what it was at initialization time
+             */
+            reset(): void;
 
-			onClick(e: MouseEvent): boolean | void;
+            _hasBeenBlurred?: boolean;
+        }
 
-			// set(name: 'showLabel', value: boolean): this;
-			// set(name: 'value', value: string): this;
-			// set(name: 'name', value: string): this;
-			// set(name: 'label', value: string): this;
-			// set(name: string, value: any): this;
-			// set(values: Object): this;
-		}
+        /* dijit/form/Button */
+
+        interface Button extends _FormWidget, _ButtonMixin {
+            /**
+             * Set this to true to hide the label text and display only the icon.
+             * (If showLabel=false then iconClass must be specified.)
+             * Especially useful for toolbars.
+             * If showLabel=true, the label will become the title (a.k.a. tooltip/hint)
+             */
+            showLabel: boolean;
 
-		interface ButtonConstructor extends _WidgetBaseConstructor<Button> { }
-
-		/* dijit/form/CheckBox */
+            /**
+             * Class to apply to DOMNode in button to make it display an icon
+             */
+            iconClass: string;
 
-		interface CheckBox extends ToggleButton, _CheckBoxMixin {
-			templateString: string;
-			baseClass: string;
-			postMixInProperties(): void;
-			value: string;
+            baseClass: string;
+            templateString: string;
+            postCreate(): void;
+            setLabel(content: string): void;
+            onLabelSet(e: Event): void;
 
-			// set(name: 'value', value: string | boolean): this;
-			// set(name: string, value: any): this;
-			// set(values: Object): this;
-		}
+            onClick(e: MouseEvent): boolean | void;
 
-		interface CheckBoxConstructor extends _WidgetBaseConstructor<CheckBox> { }
-
-		/* dijit/form/ComboBox */
+            // set(name: 'showLabel', value: boolean): this;
+            // set(name: 'value', value: string): this;
+            // set(name: 'name', value: string): this;
+            // set(name: 'label', value: string): this;
+            // set(name: string, value: any): this;
+            // set(values: Object): this;
+        }
 
-		interface ComboBox<T extends Object = any, Q extends dojo.store.api.BaseQueryType = dojo.store.api.BaseQueryType, O extends dojo.store.api.QueryOptions = dojo.store.api.QueryOptions, C extends Constraints = Constraints> extends ValidationTextBox<C>, ComboBoxMixin<T, Q, O> {
-			// set(name: string, value: any): this;
-			// set(values: Object): this;
-		}
+        interface ButtonConstructor extends _WidgetBaseConstructor<Button> { }
+
+        /* dijit/form/CheckBox */
 
-		interface ComboBoxConstructor extends _WidgetBaseConstructor<ComboBox<any>> {
-			new <T extends Object = any, Q extends dojo.store.api.BaseQueryType = dojo.store.api.BaseQueryType, O extends dojo.store.api.QueryOptions = dojo.store.api.QueryOptions, C extends Constraints = Constraints>(params: Object, srcNodeRef: dojo.NodeOrString): ComboBox<T, Q, O, C>;
-		}
-
-		/* dijit/form/ComboBoxMixin */
-
-		interface ComboBoxMixin<T extends Object = any, Q extends dojo.store.api.BaseQueryType = dojo.store.api.BaseQueryType, O extends dojo.store.api.QueryOptions = dojo.store.api.QueryOptions> extends _HasDropDown<_ComboBoxMenu<T>>, _AutoCompleterMixin<T, Q, O> {
+        interface CheckBox extends ToggleButton, _CheckBoxMixin {
+            templateString: string;
+            baseClass: string;
+            postMixInProperties(): void;
+            value: string;
 
-			/**
-			 * Dropdown widget class used to select a date/time.
-			 * Subclasses should specify this.
-			 */
-			dropDownClass: _ComboBoxMenu<T>;
+            // set(name: 'value', value: string | boolean): this;
+            // set(name: string, value: any): this;
+            // set(values: Object): this;
+        }
+
+        interface CheckBoxConstructor extends _WidgetBaseConstructor<CheckBox> { }
+
+        /* dijit/form/ComboBox */
+
+        interface ComboBox<T extends Object = any, Q extends dojo.store.api.BaseQueryType = dojo.store.api.BaseQueryType, O extends dojo.store.api.QueryOptions = dojo.store.api.QueryOptions, C extends Constraints = Constraints> extends ValidationTextBox<C>, ComboBoxMixin<T, Q, O> {
+            // set(name: string, value: any): this;
+            // set(values: Object): this;
+        }
 
-			/**
-			 * Set this textbox to have a down arrow button, to display the drop down list.
-			 * Defaults to true.
-			 */
-			hasDownArrow: boolean;
+        interface ComboBoxConstructor extends _WidgetBaseConstructor<ComboBox<any>> {
+            new <T extends Object = any, Q extends dojo.store.api.BaseQueryType = dojo.store.api.BaseQueryType, O extends dojo.store.api.QueryOptions = dojo.store.api.QueryOptions, C extends Constraints = Constraints>(params: Object, srcNodeRef: dojo.NodeOrString): ComboBox<T, Q, O, C>;
+        }
+
+        /* dijit/form/ComboBoxMixin */
 
-			templateString: string;
-			baseClass: string;
+        interface ComboBoxMixin<T extends Object = any, Q extends dojo.store.api.BaseQueryType = dojo.store.api.BaseQueryType, O extends dojo.store.api.QueryOptions = dojo.store.api.QueryOptions> extends _HasDropDown<_ComboBoxMenu<T>>, _AutoCompleterMixin<T, Q, O> {
 
-			/**
-			 * Reference to data provider object used by this ComboBox.
-			 *
-			 * Should be dojo/store/api/Store, but dojo/data/api/Read supported
-			 * for backwards compatibility.
-			 */
-			store: dojo.store.api.Store<T, Q, O>;
+            /**
+             * Dropdown widget class used to select a date/time.
+             * Subclasses should specify this.
+             */
+            dropDownClass: _ComboBoxMenu<T>;
 
-			cssStateNodes: CSSStateNodes;
-			postMixInProperties(): void;
-			buildRendering(): void;
-		}
+            /**
+             * Set this textbox to have a down arrow button, to display the drop down list.
+             * Defaults to true.
+             */
+            hasDownArrow: boolean;
 
-		interface ComboBoxMixinConstructor<T = any, U extends dojo.store.api.BaseQueryType = dojo.store.api.BaseQueryType, V = any> extends _WidgetBaseConstructor<ComboBoxMixin<T, U, V>> { }
-
-		/* dijit/form/CurrencyTextBox */
-
-		interface CurrencyTextBoxConstraints extends NumberTextBoxConstraints, dojo.CurrencyFormatOptions, dojo.CurrencyParseOptions {
-		}
+            templateString: string;
+            baseClass: string;
 
-		interface CurrencyTextBox extends NumberTextBox {
-			/**
-			 * the [ISO4217](http://en.wikipedia.org/wiki/ISO_4217) currency code, a three letter sequence like "USD"
-			 */
-			currency: string;
+            /**
+             * Reference to data provider object used by this ComboBox.
+             *
+             * Should be dojo/store/api/Store, but dojo/data/api/Read supported
+             * for backwards compatibility.
+             */
+            store: dojo.store.api.Store<T, Q, O>;
 
-			/**
-			 * Despite the name, this parameter specifies both constraints on the input
-			 * (including minimum/maximum allowed values) as well as
-			 * formatting options.  See `dijit/form/CurrencyTextBox.__Constraints` for details.
-			 */
-			constraints: CurrencyTextBoxConstraints;
+            cssStateNodes: CSSStateNodes;
+            postMixInProperties(): void;
+            buildRendering(): void;
+        }
 
-			baseClass: string;
+        interface ComboBoxMixinConstructor<T = any, U extends dojo.store.api.BaseQueryType = dojo.store.api.BaseQueryType, V = any> extends _WidgetBaseConstructor<ComboBoxMixin<T, U, V>> { }
 
-			_formatter: (value: number, options?: dojo.CurrencyFormatOptions) => string;
-			_parser: (expression: string, options?: dojo.CurrencyParseOptions) => number;
-			_regExpGenerator: (options?: dojo.NumberRegexpOptions) => string;
+        /* dijit/form/CurrencyTextBox */
+
+        interface CurrencyTextBoxConstraints extends NumberTextBoxConstraints, dojo.CurrencyFormatOptions, dojo.CurrencyParseOptions {
+        }
 
-			/**
-			 * Parses string value as a Currency, according to the constraints object
-			 */
-			parse(value: string, constraints: CurrencyTextBoxConstraints): string;
-		}
+        interface CurrencyTextBox extends NumberTextBox {
+            /**
+             * the [ISO4217](http://en.wikipedia.org/wiki/ISO_4217) currency code, a three letter sequence like "USD"
+             */
+            currency: string;
 
-		interface CurrencyTextBoxConstructor extends _WidgetBaseConstructor<CurrencyTextBox> { }
-
-		/* dijit/form/DataList */
+            /**
+             * Despite the name, this parameter specifies both constraints on the input
+             * (including minimum/maximum allowed values) as well as
+             * formatting options.  See `dijit/form/CurrencyTextBox.__Constraints` for details.
+             */
+            constraints: CurrencyTextBoxConstraints;
 
-		interface DataList<T extends Object> extends dojo.store.Memory<T> {
-			/**
-			 * Get the option marked as selected, like `<option selected>`.
-			 * Not part of dojo.data API.
-			 */
-			fetchSelectedItem(): T;
-		}
+            baseClass: string;
+
+            _formatter: (value: number, options?: dojo.CurrencyFormatOptions) => string;
+            _parser: (expression: string, options?: dojo.CurrencyParseOptions) => number;
+            _regExpGenerator: (options?: dojo.NumberRegexpOptions) => string;
 
-		interface DataListConstructor {
-			new <T extends Object>(params: Object, srcNodeRef: dojo.NodeOrString): DataList<T>;
-		}
+            /**
+             * Parses string value as a Currency, according to the constraints object
+             */
+            parse(value: string, constraints: CurrencyTextBoxConstraints): string;
+        }
 
-		/* dijit/form/DateTextBox */
+        interface CurrencyTextBoxConstructor extends _WidgetBaseConstructor<CurrencyTextBox> { }
+
+        /* dijit/form/DataList */
 
-		interface DateTextBox extends _DateTimeTextBox<Calendar> {
-			baseClass: string;
-			popupClass: CalendarConstructor;
-			_selector: string;
-			maxHeight: number;
+        interface DataList<T extends Object> extends dojo.store.Memory<T> {
+            /**
+             * Get the option marked as selected, like `<option selected>`.
+             * Not part of dojo.data API.
+             */
+            fetchSelectedItem(): T;
+        }
 
-			/**
-			 * The value of this widget as a JavaScript Date object, with only year/month/day specified.`
-			 */
-			value: Date;
-		}
+        interface DataListConstructor {
+            new <T extends Object>(params: Object, srcNodeRef: dojo.NodeOrString): DataList<T>;
+        }
 
-		interface DateTextBoxConstructor extends _WidgetBaseConstructor<DateTextBox> { }
-
-		/* dijit/form/DropDownButton */
+        /* dijit/form/DateTextBox */
 
-		interface DropDownButton<T extends _WidgetBase> extends Button, _Container, _HasDropDown<T> {
-			baseClass: string;
-			templateString: string;
+        interface DateTextBox extends _DateTimeTextBox<Calendar> {
+            baseClass: string;
+            popupClass: CalendarConstructor;
+            _selector: string;
+            maxHeight: number;
 
-			/**
-			 * Overrides _TemplatedMixin#_fillContent().
-			 * My inner HTML possibly contains both the button label and/or a drop down widget, like
-			 * <DropDownButton>  <span>push me</span>  <Menu> ... </Menu> </DropDownButton>
-			 */
-			_fillContent(): void;
-			startup(): void;
+            /**
+             * The value of this widget as a JavaScript Date object, with only year/month/day specified.`
+             */
+            value: Date;
+        }
 
-			/**
-			 * Returns whether or not we are loaded - if our dropdown has an href,
-			 * then we want to check that.
-			 */
-			isLoaded(): boolean;
+        interface DateTextBoxConstructor extends _WidgetBaseConstructor<DateTextBox> { }
+
+        /* dijit/form/DropDownButton */
 
-			/**
-			 * Default implementation assumes that drop down already exists,
-			 * but hasn't loaded it's data (ex: ContentPane w/href).
-			 * App must override if the drop down is lazy-created.
-			 */
-			loadDropDown(callback: () => void): void;
+        interface DropDownButton<T extends _WidgetBase> extends Button, _Container, _HasDropDown<T> {
+            baseClass: string;
+            templateString: string;
+
+            /**
+             * Overrides _TemplatedMixin#_fillContent().
+             * My inner HTML possibly contains both the button label and/or a drop down widget, like
+             * <DropDownButton>  <span>push me</span>  <Menu> ... </Menu> </DropDownButton>
+             */
+            _fillContent(): void;
+            startup(): void;
 
-			/**
-			 * Overridden so that focus is handled by the _HasDropDown mixin, not by
-			 * the _FormWidget mixin.
-			 */
-			isFocusable(): boolean;
-		}
+            /**
+             * Returns whether or not we are loaded - if our dropdown has an href,
+             * then we want to check that.
+             */
+            isLoaded(): boolean;
 
-		interface DropDownButtonConstructor extends _WidgetBaseConstructor<DropDownButton<any>> {
-			new <T extends _WidgetBase>(params: Object, srcNodeRef: dojo.NodeOrString): DropDownButton<T>;
-		}
-
-		/* dijit/form/FilteringSelect */
-
-		interface FilteringSelect<C extends Constraints, T extends Object, Q extends string | Object | Function, O extends dojo.store.api.QueryOptions> extends MappedTextBox<C>, ComboBoxMixin<T, Q, O> {
-			/**
-			 * True (default) if user is required to enter a value into this field.
-			 */
-			required: boolean;
+            /**
+             * Default implementation assumes that drop down already exists,
+             * but hasn't loaded it's data (ex: ContentPane w/href).
+             * App must override if the drop down is lazy-created.
+             */
+            loadDropDown(callback: () => void): void;
 
-			_lastDisplayedValue: string;
-			_isValidSubset(): boolean;
-			isValid(): boolean;
-			_refreshState(): void;
+            /**
+             * Overridden so that focus is handled by the _HasDropDown mixin, not by
+             * the _FormWidget mixin.
+             */
+            isFocusable(): boolean;
+        }
 
-			/**
-			 * Callback from dojo.store after lookup of user entered value finishes
-			 */
-			_callbackSetLabel(result: T[], query: Q, options: O, priorityChange?: boolean): void;
+        interface DropDownButtonConstructor extends _WidgetBaseConstructor<DropDownButton<any>> {
+            new <T extends _WidgetBase>(params: Object, srcNodeRef: dojo.NodeOrString): DropDownButton<T>;
+        }
 
-			_openResultList(results: T[], query: Q, options: O): void;
-			undo(): void;
+        /* dijit/form/FilteringSelect */
 
-			// set(name: 'displayedValue', value: string): this;
-			// set(name: 'item', value: T): this;
-			// set(name: string, value: any): this;
-			// set(values: Object): this;
-		}
-
-		interface FilteringSelectConstructor extends _WidgetBaseConstructor<FilteringSelect<any, any, any, any>> {
-			new <C extends Constraints, T extends Object, Q extends string | Object | Function, O extends dojo.store.api.QueryOptions>(params: Object, srcNodeRef: dojo.NodeOrString): FilteringSelect<C, T, Q, O>;
-		}
+        interface FilteringSelect<C extends Constraints, T extends Object, Q extends string | Object | Function, O extends dojo.store.api.QueryOptions> extends MappedTextBox<C>, ComboBoxMixin<T, Q, O> {
+            /**
+             * True (default) if user is required to enter a value into this field.
+             */
+            required: boolean;
 
-		/* dijit/form/Form */
+            _lastDisplayedValue: string;
+            _isValidSubset(): boolean;
+            isValid(): boolean;
+            _refreshState(): void;
 
-		interface Form extends _Widget, _TemplatedMixin, _FormMixin, layout._ContentPaneResizeMixin {
-			name?: string;
-			action?: string;
-			method?: string;
-			encType?: string;
-			'accept-charset'?: string;
-			accept?: string;
-			target?: string;
-			templateString: string;
+            /**
+             * Callback from dojo.store after lookup of user entered value finishes
+             */
+            _callbackSetLabel(result: T[], query: Q, options: O, priorityChange?: boolean): void;
+
+            _openResultList(results: T[], query: Q, options: O): void;
+            undo(): void;
 
-			/**
-			 * Deprecated: use submit()
-			 */
-			execute(formContents: Object): void;
+            // set(name: 'displayedValue', value: string): this;
+            // set(name: 'item', value: T): this;
+            // set(name: string, value: any): this;
+            // set(values: Object): this;
+        }
 
-			/**
-			 * Deprecated: use onSubmit()
-			 */
-			onExecute(): void;
+        interface FilteringSelectConstructor extends _WidgetBaseConstructor<FilteringSelect<any, any, any, any>> {
+            new <C extends Constraints, T extends Object, Q extends string | Object | Function, O extends dojo.store.api.QueryOptions>(params: Object, srcNodeRef: dojo.NodeOrString): FilteringSelect<C, T, Q, O>;
+        }
+
+        /* dijit/form/Form */
 
-			/**
-			 * restores all widget values back to their init values,
-			 * calls onReset() which can cancel the reset by returning false
-			 */
-			reset(e?: Event): void;
+        interface Form extends _Widget, _TemplatedMixin, _FormMixin, layout._ContentPaneResizeMixin {
+            name?: string;
+            action?: string;
+            method?: string;
+            encType?: string;
+            'accept-charset'?: string;
+            accept?: string;
+            target?: string;
+            templateString: string;
 
-			/**
-			 * Callback when user resets the form. This method is intended
-			 * to be over-ridden. When the `reset` method is called
-			 * programmatically, the return value from `onReset` is used
-			 * to compute whether or not resetting should proceed
-			 */
-			onReset(e?: Event): boolean;
-
-			/**
-			 * Callback when user submits the form.
-			 */
-			onSubmit(e?: Event): boolean;
+            /**
+             * Deprecated: use submit()
+             */
+            execute(formContents: Object): void;
 
-			/**
-			 * programmatically submit form if and only if the `onSubmit` returns true
-			 */
-			submit(): void;
-		}
+            /**
+             * Deprecated: use onSubmit()
+             */
+            onExecute(): void;
 
-		interface FormConstructor extends _WidgetBaseConstructor<Form> { }
-
-		/* dijit/form/HorizontalRule */
+            /**
+             * restores all widget values back to their init values,
+             * calls onReset() which can cancel the reset by returning false
+             */
+            reset(e?: Event): void;
 
-		/**
-		 * Hash marks for `dijit/form/HorizontalSlider`
-		 */
-		interface HorizontalRule extends _Widget, _TemplatedMixin {
-			/**
-			 * Number of hash marks to generate
-			 */
-			count: number;
+            /**
+             * Callback when user resets the form. This method is intended
+             * to be over-ridden. When the `reset` method is called
+             * programmatically, the return value from `onReset` is used
+             * to compute whether or not resetting should proceed
+             */
+            onReset(e?: Event): boolean;
 
-			/**
-			 * For HorizontalSlider, this is either "topDecoration" or "bottomDecoration", and indicates whether this rule goes above or below the slider.
-			 */
-			container: string;
+            /**
+             * Callback when user submits the form.
+             */
+            onSubmit(e?: Event): boolean;
 
-			/**
-			 * CSS style to apply to individual hash marks
-			 */
-			ruleStyle: string;
+            /**
+             * programmatically submit form if and only if the `onSubmit` returns true
+             */
+            submit(): void;
+        }
 
-			_positionPrefix: string;
-			_positionSuffix: string;
-			_suffix: string;
+        interface FormConstructor extends _WidgetBaseConstructor<Form> { }
 
-			_genHTML(pos: number): string;
+        /* dijit/form/HorizontalRule */
 
-			/**
-			 * VerticalRule will override this...
-			 */
-			_isHorizontal: boolean;
-		}
-
-		interface HorizontalRuleConstructor extends _WidgetBaseConstructor<HorizontalRule> { }
-
-		/* dijit/form/HorizontalRuleLabels */
+        /**
+         * Hash marks for `dijit/form/HorizontalSlider`
+         */
+        interface HorizontalRule extends _Widget, _TemplatedMixin {
+            /**
+             * Number of hash marks to generate
+             */
+            count: number;
 
-		/**
-		 * Labels for `dijit/form/HorizontalSlider`
-		 */
-		interface HorizontalRuleLabels extends HorizontalRule {
-			/**
-			 * CSS style to apply to individual text labels
-			 */
-			labelStyle: string;
+            /**
+             * For HorizontalSlider, this is either "topDecoration" or "bottomDecoration", and indicates whether this rule goes above or below the slider.
+             */
+            container: string;
 
-			/**
-			 * Array of text labels to render - evenly spaced from left-to-right or bottom-to-top.
-			 * Alternately, minimum and maximum can be specified, to get numeric labels.
-			 */
-			labels: string[];
+            /**
+             * CSS style to apply to individual hash marks
+             */
+            ruleStyle: string;
+
+            _positionPrefix: string;
+            _positionSuffix: string;
+            _suffix: string;
+
+            _genHTML(pos: number): string;
 
-			/**
-			 * Number of generated numeric labels that should be rendered as '' on the ends when labels[] are not specified
-			 */
-			numericMargin: number;
+            /**
+             * VerticalRule will override this...
+             */
+            _isHorizontal: boolean;
+        }
 
-			/**
-			 * Leftmost label value for generated numeric labels when labels[] are not specified
-			 */
-			minimum: number;
+        interface HorizontalRuleConstructor extends _WidgetBaseConstructor<HorizontalRule> { }
 
-			/**
-			 * Rightmost label value for generated numeric labels when labels[] are not specified
-			 */
-			maximum: number;
+        /* dijit/form/HorizontalRuleLabels */
 
-			/**
-			 * pattern, places, lang, et al (see dojo.number) for generated numeric labels when labels[] are not specified
-			 */
-			constraints: { pattern: string };
+        /**
+         * Labels for `dijit/form/HorizontalSlider`
+         */
+        interface HorizontalRuleLabels extends HorizontalRule {
+            /**
+             * CSS style to apply to individual text labels
+             */
+            labelStyle: string;
 
-			/**
-			 * Returns the value to be used in HTML for the label as part of the left: attribute
-			 */
-			_calcPosition(pos: number): number;
+            /**
+             * Array of text labels to render - evenly spaced from left-to-right or bottom-to-top.
+             * Alternately, minimum and maximum can be specified, to get numeric labels.
+             */
+            labels: string[];
 
-			_genHTML(pos: number, ndx?: number): string;
-
-			/**
-			 * extension point for bidi code
-			 */
-			_genDirectionHTML(label: string): string;
+            /**
+             * Number of generated numeric labels that should be rendered as '' on the ends when labels[] are not specified
+             */
+            numericMargin: number;
 
-			/**
-			 * Overridable function to return array of labels to use for this slider.
-			 * Can specify a getLabels() method instead of a labels[] array, or min/max attributes.
-			 */
-			getLabels(): string[];
-		}
+            /**
+             * Leftmost label value for generated numeric labels when labels[] are not specified
+             */
+            minimum: number;
 
-		interface HorizontalRuleLabelsConstructor extends _WidgetBaseConstructor<HorizontalRuleLabels> { }
-
-		/* dijit/form/HorizontalSlider */
-
-		interface _SliderMover extends dojo.dnd.Mover { }
+            /**
+             * Rightmost label value for generated numeric labels when labels[] are not specified
+             */
+            maximum: number;
 
-		/**
-		 * A form widget that allows one to select a value with a horizontally draggable handle
-		 */
-		interface HorizontalSlider extends _FormValueWidget, _Container {
-			/**
-			 * Show increment/decrement buttons at the ends of the slider?
-			 */
-			showButtons: boolean;
+            /**
+             * pattern, places, lang, et al (see dojo.number) for generated numeric labels when labels[] are not specified
+             */
+            constraints: { pattern: string };
 
-			/**
-			 * The minimum value the slider can be set to.
-			 */
-			minimum: number;
+            /**
+             * Returns the value to be used in HTML for the label as part of the left: attribute
+             */
+            _calcPosition(pos: number): number;
+
+            _genHTML(pos: number, ndx?: number): string;
+
+            /**
+             * extension point for bidi code
+             */
+            _genDirectionHTML(label: string): string;
 
-			/**
-			 * The maximum value the slider can be set to.
-			 */
-			maximum: number;
+            /**
+             * Overridable function to return array of labels to use for this slider.
+             * Can specify a getLabels() method instead of a labels[] array, or min/max attributes.
+             */
+            getLabels(): string[];
+        }
 
-			/**
-			 * If specified, indicates that the slider handle has only 'discreteValues' possible positions, and that after dragging the handle, it will snap to the nearest possible position.
-			 * Thus, the slider has only 'discreteValues' possible values.
-			 *
-			 * For example, if minimum=10, maxiumum=30, and discreteValues=3, then the slider handle has three possible positions, representing values 10, 20, or 30.
-			 *
-			 * If discreteValues is not specified or if it's value is higher than the number of pixels in the slider bar, then the slider handle can be moved freely, and the slider's value will be computed/reported based on pixel position (in this case it will likely be fractional, such as 123.456789).
-			 */
-			discreteValues: number;
+        interface HorizontalRuleLabelsConstructor extends _WidgetBaseConstructor<HorizontalRuleLabels> { }
+
+        /* dijit/form/HorizontalSlider */
+
+        interface _SliderMover extends dojo.dnd.Mover { }
 
-			/**
-			 * If discreteValues is also specified, this indicates the amount of clicks (ie, snap positions) that the slider handle is moved via pageup/pagedown keys.
-			 * If discreteValues is not specified, it indicates the number of pixels.
-			 */
-			pageIncrement: number;
+        /**
+         * A form widget that allows one to select a value with a horizontally draggable handle
+         */
+        interface HorizontalSlider extends _FormValueWidget, _Container {
+            /**
+             * Show increment/decrement buttons at the ends of the slider?
+             */
+            showButtons: boolean;
 
-			/**
-			 * If clicking the slider bar changes the value or not
-			 */
-			clickSelect: boolean;
+            /**
+             * The minimum value the slider can be set to.
+             */
+            minimum: number;
 
-			/**
-			 * The time in ms to take to animate the slider handle from 0% to 100%, when clicking the slider bar to make the handle move.
-			 */
-			slideDuration: number;
+            /**
+             * The maximum value the slider can be set to.
+             */
+            maximum: number;
 
-			_mousePixelCoord: string;
-			_pixelCount: string;
-			_startingPixelCoord: string;
-			_handleOffsetCoord: string;
-			_progressPixelSize: string;
-
-			_onKeyUp(e: Event): void;
-			_onKeyDown(e: Event): void;
-			_onHandleClick(e: Event): void;
+            /**
+             * If specified, indicates that the slider handle has only 'discreteValues' possible positions, and that after dragging the handle, it will snap to the nearest possible position.
+             * Thus, the slider has only 'discreteValues' possible values.
+             *
+             * For example, if minimum=10, maxiumum=30, and discreteValues=3, then the slider handle has three possible positions, representing values 10, 20, or 30.
+             *
+             * If discreteValues is not specified or if it's value is higher than the number of pixels in the slider bar, then the slider handle can be moved freely, and the slider's value will be computed/reported based on pixel position (in this case it will likely be fractional, such as 123.456789).
+             */
+            discreteValues: number;
 
-			/**
-			 * Returns true if direction is from right to left
-			 */
-			_isReversed(): boolean;
-
-			_onBarClick(e: Event): void;
+            /**
+             * If discreteValues is also specified, this indicates the amount of clicks (ie, snap positions) that the slider handle is moved via pageup/pagedown keys.
+             * If discreteValues is not specified, it indicates the number of pixels.
+             */
+            pageIncrement: number;
 
-			_setPixelValue(pixelValue: number, maxPixels: number, priorityChange?: boolean): void;
-
-			_setValueAttr(value: number, priorityChange?: boolean): void;
+            /**
+             * If clicking the slider bar changes the value or not
+             */
+            clickSelect: boolean;
 
-			_bumpValue(signedChange: number, priorityChange: boolean): void;
-
-			_onClkBumper(val: any): void;
-			_onClkIncBumper(): void;
-			_onClkDecBumper(): void;
+            /**
+             * The time in ms to take to animate the slider handle from 0% to 100%, when clicking the slider bar to make the handle move.
+             */
+            slideDuration: number;
 
-			decrement(e: Event): void;
-			increment(e: Event): void;
-
-			_mouseWheeled(evt: Event): void;
+            _mousePixelCoord: string;
+            _pixelCount: string;
+            _startingPixelCoord: string;
+            _handleOffsetCoord: string;
+            _progressPixelSize: string;
 
-			_typematicCallback(count: number, button: Element, e: Event): void;
-		}
+            _onKeyUp(e: Event): void;
+            _onKeyDown(e: Event): void;
+            _onHandleClick(e: Event): void;
 
-		interface HorizontalSliderConstructor extends _WidgetBaseConstructor<HorizontalSlider> {
-			/**
-			 * for monkey patching
-			 */
-			_Mover: _SliderMover;
-		}
+            /**
+             * Returns true if direction is from right to left
+             */
+            _isReversed(): boolean;
+
+            _onBarClick(e: Event): void;
 
-		/* dijit/form/MappedTextBox */
+            _setPixelValue(pixelValue: number, maxPixels: number, priorityChange?: boolean): void;
+
+            _setValueAttr(value: number, priorityChange?: boolean): void;
+
+            _bumpValue(signedChange: number, priorityChange: boolean): void;
 
-		interface MappedTextBox<C extends Constraints> extends ValidationTextBox<C> {
-			postMixInProperties(): void;
-			serialize: SerializationFunction;
-			toString(): string;
-			validate(isFocused?: boolean): boolean;
-			buildRendering(): void;
-			reset(): void;
-		}
+            _onClkBumper(val: any): void;
+            _onClkIncBumper(): void;
+            _onClkDecBumper(): void;
 
-		interface MappedTextBoxConstructor extends _WidgetBaseConstructor<MappedTextBox<Constraints>> {
-			new <C extends Constraints>(params: Object, srcNodeRef: dojo.NodeOrString): MappedTextBox<C>;
-		}
+            decrement(e: Event): void;
+            increment(e: Event): void;
 
-		/* dijit/form/NumberSpinner */
+            _mouseWheeled(evt: Event): void;
+
+            _typematicCallback(count: number, button: Element, e: Event): void;
+        }
 
-		interface NumberSpinner extends _Spinner, NumberTextBoxMixin {
-			constraints: NumberTextBoxConstraints;
-			baseClass: string;
-			adjust(val: any, delta: number): any;
+        interface HorizontalSliderConstructor extends _WidgetBaseConstructor<HorizontalSlider> {
+            /**
+             * for monkey patching
+             */
+            _Mover: _SliderMover;
+        }
+
+        /* dijit/form/MappedTextBox */
 
-			/* overrides */
-			pattern: ConstraintsToRegExpString<NumberTextBoxConstraints>;
-			parse(value: string, constraints: NumberTextBoxConstraints): string;
-			format(value: number, constraints: NumberTextBoxConstraints): string;
-			filter(value: number): number;
-			value: number;
-		}
+        interface MappedTextBox<C extends Constraints> extends ValidationTextBox<C> {
+            postMixInProperties(): void;
+            serialize: SerializationFunction;
+            toString(): string;
+            validate(isFocused?: boolean): boolean;
+            buildRendering(): void;
+            reset(): void;
+        }
 
-		interface NumberSpinnerConstructor extends _WidgetBaseConstructor<NumberSpinner> { }
+        interface MappedTextBoxConstructor extends _WidgetBaseConstructor<MappedTextBox<Constraints>> {
+            new <C extends Constraints>(params: Object, srcNodeRef: dojo.NodeOrString): MappedTextBox<C>;
+        }
 
-		/* dijit/form/NumberTextBox */
+        /* dijit/form/NumberSpinner */
 
-		interface NumberTextBoxConstraints extends RangeBoundTextBoxConstraints, dojo.NumberFormatOptions, dojo.NumberParseOptions { }
+        interface NumberSpinner extends _Spinner, NumberTextBoxMixin {
+            constraints: NumberTextBoxConstraints;
+            baseClass: string;
+            adjust(val: any, delta: number): any;
 
-		interface NumberTextBoxMixin {
-			pattern: ConstraintsToRegExpString<NumberTextBoxConstraints>;
-			constraints: NumberTextBoxConstraints;
-			value: number;
-			editOptions: { pattern: string };
-			_formatter: (value: number, options?: dojo.NumberFormatOptions) => string;
-			_regExpGenerator: (options?: dojo.NumberRegexpOptions) => string;
-			_decimalInfo: (constraints: Constraints) => { sep: string; places: number; };
-			postMixInProperties(): void;
-			format(value: number, constraints: NumberTextBoxConstraints): string;
-			_parser: (expression: string, options?: dojo.NumberParseOptions) => number;
-			parse(value: string, constraints: dojo.NumberParseOptions): string;
-			filter(value: number): number;
-			serialize: SerializationFunction;
-			isValid(isFocused: boolean): boolean;
-		}
+            /* overrides */
+            pattern: ConstraintsToRegExpString<NumberTextBoxConstraints>;
+            parse(value: string, constraints: NumberTextBoxConstraints): string;
+            format(value: number, constraints: NumberTextBoxConstraints): string;
+            filter(value: number): number;
+            value: number;
+        }
 
-		interface NumberTextBoxMixinConstructor extends _WidgetBaseConstructor<NumberTextBoxMixin> { }
+        interface NumberSpinnerConstructor extends _WidgetBaseConstructor<NumberSpinner> { }
+
+        /* dijit/form/NumberTextBox */
+
+        interface NumberTextBoxConstraints extends RangeBoundTextBoxConstraints, dojo.NumberFormatOptions, dojo.NumberParseOptions { }
 
-		interface NumberTextBox extends RangeBoundTextBox, NumberTextBoxMixin {
-			constraints: NumberTextBoxConstraints;
-			pattern: ConstraintsToRegExpString<NumberTextBoxConstraints>;
-			parse(value: string, constraints: dojo.NumberParseOptions): string;
-			format(value: number, constraints: dojo.NumberFormatOptions): string;
-			value: number;
-			filter(value: number): number;
-		}
+        interface NumberTextBoxMixin {
+            pattern: ConstraintsToRegExpString<NumberTextBoxConstraints>;
+            constraints: NumberTextBoxConstraints;
+            value: number;
+            editOptions: { pattern: string };
+            _formatter: (value: number, options?: dojo.NumberFormatOptions) => string;
+            _regExpGenerator: (options?: dojo.NumberRegexpOptions) => string;
+            _decimalInfo: (constraints: Constraints) => { sep: string; places: number; };
+            postMixInProperties(): void;
+            format(value: number, constraints: NumberTextBoxConstraints): string;
+            _parser: (expression: string, options?: dojo.NumberParseOptions) => number;
+            parse(value: string, constraints: dojo.NumberParseOptions): string;
+            filter(value: number): number;
+            serialize: SerializationFunction;
+            isValid(isFocused: boolean): boolean;
+        }
 
-		interface NumberTextBoxConstructor extends _WidgetBaseConstructor<NumberTextBox> {
-			Mixin: NumberTextBoxMixinConstructor;
-		}
-
-		/* dijit/form/RadioButton */
-
-		interface RadioButton extends CheckBox, _RadioButtonMixin {
-			baseClass: string;
-		}
-
-		interface RadioButtonConstructor extends _WidgetBaseConstructor<RadioButton> { }
-
-		/* dijit/form/RangeBoundTextBox */
+        interface NumberTextBoxMixinConstructor extends _WidgetBaseConstructor<NumberTextBoxMixin> { }
 
-		interface RangeBoundTextBoxConstraints extends Constraints {
-			min?: number;
-			max?: number;
-		}
+        interface NumberTextBox extends RangeBoundTextBox, NumberTextBoxMixin {
+            constraints: NumberTextBoxConstraints;
+            pattern: ConstraintsToRegExpString<NumberTextBoxConstraints>;
+            parse(value: string, constraints: dojo.NumberParseOptions): string;
+            format(value: number, constraints: dojo.NumberFormatOptions): string;
+            value: number;
+            filter(value: number): number;
+        }
 
-		interface RangeBoundTextBox extends MappedTextBox<RangeBoundTextBoxConstraints> {
-			/**
-			 * The message to display if value is out-of-range
-			 */
-			rangeMessage: string;
+        interface NumberTextBoxConstructor extends _WidgetBaseConstructor<NumberTextBox> {
+            Mixin: NumberTextBoxMixinConstructor;
+        }
 
-			/**
-			 * Overridable function used to validate the range of the numeric input value.
-			 */
-			rangeCheck(primative: number, constraints: RangeBoundTextBoxConstraints): boolean;
+        /* dijit/form/RadioButton */
+
+        interface RadioButton extends CheckBox, _RadioButtonMixin {
+            baseClass: string;
+        }
 
-			/**
-			 * Tests if the value is in the min/max range specified in constraints
-			 */
-			isInRange(isFocused: boolean): boolean;
+        interface RadioButtonConstructor extends _WidgetBaseConstructor<RadioButton> { }
+
+        /* dijit/form/RangeBoundTextBox */
 
-			/**
-			 * Returns true if the value is out of range and will remain
-			 * out of range even if the user types more characters
-			 */
-			_isDefinitelyOutOfRange(): boolean;
+        interface RangeBoundTextBoxConstraints extends Constraints {
+            min?: number;
+            max?: number;
+        }
 
-			isValid(isFocused: boolean): boolean;
-			getErrorMessage(isFocused: boolean): string;
-			postMixInProperties(): void;
-		}
+        interface RangeBoundTextBox extends MappedTextBox<RangeBoundTextBoxConstraints> {
+            /**
+             * The message to display if value is out-of-range
+             */
+            rangeMessage: string;
 
-		interface RangeBoundTextBoxConstructor extends _WidgetBaseConstructor<RangeBoundTextBox> { }
-
-		/* dijit/form/Select */
-
-		interface Select<T extends Object, Q extends dojo.store.api.BaseQueryType, O extends dojo.store.api.QueryOptions, U extends dijit._WidgetBase> extends _FormSelectWidget<T, Q, O>, _HasDropDown<U>, _KeyNavMixin {
-			baseClass: string;
+            /**
+             * Overridable function used to validate the range of the numeric input value.
+             */
+            rangeCheck(primative: number, constraints: RangeBoundTextBoxConstraints): boolean;
 
-			/**
-			 * What to display in an "empty" drop down.
-			 */
-			emptyLabel: string;
+            /**
+             * Tests if the value is in the min/max range specified in constraints
+             */
+            isInRange(isFocused: boolean): boolean;
 
-			/**
-			 * Specifies how to interpret the labelAttr in the data store items.
-			 */
-			labelType: string;
+            /**
+             * Returns true if the value is out of range and will remain
+             * out of range even if the user types more characters
+             */
+            _isDefinitelyOutOfRange(): boolean;
 
-			/**
-			 * Currently displayed error/prompt message
-			 */
-			message: string;
+            isValid(isFocused: boolean): boolean;
+            getErrorMessage(isFocused: boolean): string;
+            postMixInProperties(): void;
+        }
+
+        interface RangeBoundTextBoxConstructor extends _WidgetBaseConstructor<RangeBoundTextBox> { }
 
-			/**
-			 * Can be true or false, default is false.
-			 */
-			required: boolean;
+        /* dijit/form/Select */
+
+        interface Select<T extends Object, Q extends dojo.store.api.BaseQueryType, O extends dojo.store.api.QueryOptions, U extends dijit._WidgetBase> extends _FormSelectWidget<T, Q, O>, _HasDropDown<U>, _KeyNavMixin {
+            baseClass: string;
 
-			/**
-			 * "Incomplete" if this select is required but unset (i.e. blank value), "" otherwise
-			 */
-			state: string;
+            /**
+             * What to display in an "empty" drop down.
+             */
+            emptyLabel: string;
 
-			/**
-			 * Order fields are traversed when user hits the tab key
-			 */
-			tabIndex: any;
-			templateString: any;
+            /**
+             * Specifies how to interpret the labelAttr in the data store items.
+             */
+            labelType: string;
 
-			/**
-			 * See the description of dijit/Tooltip.defaultPosition for details on this parameter.
-			 */
-			tooltipPosition: any;
+            /**
+             * Currently displayed error/prompt message
+             */
+            message: string;
 
-			childSelector(node: Element | Node): boolean;
-			destroy(preserveDom: boolean): void;
-			focus(): void;
+            /**
+             * Can be true or false, default is false.
+             */
+            required: boolean;
 
-			/**
-			 * Sets the value to the given option, used during search by letter.
-			 * @param widget Reference to option's widget
-			 */
-			focusChild(widget: dijit._WidgetBase): void;
-			isLoaded(): boolean;
+            /**
+             * "Incomplete" if this select is required but unset (i.e. blank value), "" otherwise
+             */
+            state: string;
 
-			/**
-			 * Whether or not this is a valid value.
-			 * @param isFocused
-			 */
-			isValid(isFocused: boolean): boolean;
+            /**
+             * Order fields are traversed when user hits the tab key
+             */
+            tabIndex: any;
+            templateString: any;
+
+            /**
+             * See the description of dijit/Tooltip.defaultPosition for details on this parameter.
+             */
+            tooltipPosition: any;
 
-			/**
-			 * populates the menu
-			 * @param loadCallback
-			 */
-			loadDropDown(loadCallback: () => any): void;
-			postCreate(): void;
-
-			/**
-			 * set the missing message
-			 */
-			postMixInProperties(): void;
+            childSelector(node: Element | Node): boolean;
+            destroy(preserveDom: boolean): void;
+            focus(): void;
 
-			/**
-			 * Overridden so that the state will be cleared.
-			 */
-			reset(): void;
-			startup(): void;
+            /**
+             * Sets the value to the given option, used during search by letter.
+             * @param widget Reference to option's widget
+             */
+            focusChild(widget: dijit._WidgetBase): void;
+            isLoaded(): boolean;
 
-			/**
-			 * Called by oninit, onblur, and onkeypress, and whenever required/disabled state changes
-			 * @param isFocused
-			 */
-			validate(isFocused: boolean): boolean;
+            /**
+             * Whether or not this is a valid value.
+             * @param isFocused
+             */
+            isValid(isFocused: boolean): boolean;
 
-			/**
-			 * When a key is pressed that matches a child item,
-			 * this method is called so that a widget can take
-			 * appropriate action is necessary.
-			 * @param item
-			 * @param evt
-			 * @param searchString
-			 * @param numMatches
-			 */
-			onKeyboardSearch(item: dijit._WidgetBase, evt: Event, searchString: string, numMatches: number): void;
-		}
+            /**
+             * populates the menu
+             * @param loadCallback
+             */
+            loadDropDown(loadCallback: () => any): void;
+            postCreate(): void;
 
-		interface SelectConstructor extends _WidgetBaseConstructor<Select<any, any, any, any>> { }
+            /**
+             * set the missing message
+             */
+            postMixInProperties(): void;
 
-		/* dijit/form/SimpleTextarea */
+            /**
+             * Overridden so that the state will be cleared.
+             */
+            reset(): void;
+            startup(): void;
 
-		interface SimpleTextarea extends TextBox {
-			baseClass: string;
-			rows: string;
-			cols: string;
-			templateString: string;
-			postMixInProperties(): void;
-			buildRendering(): void;
-			filter(value: string): string;
-		}
-
-		interface SimpleTextareaConstructor extends _WidgetBaseConstructor<SimpleTextarea> {
-			new (params: Object, srcNodeRef: dojo.NodeOrString): SimpleTextarea;
-		}
+            /**
+             * Called by oninit, onblur, and onkeypress, and whenever required/disabled state changes
+             * @param isFocused
+             */
+            validate(isFocused: boolean): boolean;
 
-		/* dijit/form/Textarea */
+            /**
+             * When a key is pressed that matches a child item,
+             * this method is called so that a widget can take
+             * appropriate action is necessary.
+             * @param item
+             * @param evt
+             * @param searchString
+             * @param numMatches
+             */
+            onKeyboardSearch(item: dijit._WidgetBase, evt: Event, searchString: string, numMatches: number): void;
+        }
 
-		interface Textarea extends SimpleTextarea, _ExpandingTextAreaMixin {
-			baseClass: string;
-			cols: string;
-			buildRendering(): void;
-		}
+        interface SelectConstructor extends _WidgetBaseConstructor<Select<any, any, any, any>> { }
 
-		interface TextareaConstructor extends _WidgetBaseConstructor<Textarea> { }
-
-		/* dijit/form/TextBox */
+        /* dijit/form/SimpleTextarea */
 
-		interface TextBox extends _FormValueWidget, _TextBoxMixin<Constraints> {
-			// set(name: 'displayedValue', value: string): this;
-			// set(name: 'disabled', value: boolean): this;
-			// set(name: 'value', value: string): this;
-			// set(name: string, value: any): this;
-			// set(values: Object): this;
+        interface SimpleTextarea extends TextBox {
+            baseClass: string;
+            rows: string;
+            cols: string;
+            templateString: string;
+            postMixInProperties(): void;
+            buildRendering(): void;
+            filter(value: string): string;
+        }
 
-			// get(name: 'displayedValue'): string;
-			// get(name: 'value'): string;
-			// get(name: string): any;
-		}
+        interface SimpleTextareaConstructor extends _WidgetBaseConstructor<SimpleTextarea> {
+            new(params: Object, srcNodeRef: dojo.NodeOrString): SimpleTextarea;
+        }
 
-		interface TextBoxConstructor extends _WidgetBaseConstructor<TextBox> { }
-
-		/* dijit/form/ToggleButton */
-
-		interface ToggleButton extends Button, _ToggleButtonMixin {
-			baseClass: string;
+        /* dijit/form/Textarea */
 
-			setChecked(checked: boolean): void;
+        interface Textarea extends SimpleTextarea, _ExpandingTextAreaMixin {
+            baseClass: string;
+            cols: string;
+            buildRendering(): void;
+        }
+
+        interface TextareaConstructor extends _WidgetBaseConstructor<Textarea> { }
 
-			// set(name: 'checked', value: boolean): this;
-			// set(name: string, value: any): this;
-			// set(values: Object): this;
-		}
+        /* dijit/form/TextBox */
+
+        interface TextBox extends _FormValueWidget, _TextBoxMixin<Constraints> {
+
+        }
+
+        interface TextBoxConstructor extends _WidgetBaseConstructor<TextBox> { }
 
-		interface ToggleButtonConstructor extends _WidgetBaseConstructor<ToggleButton> { }
+        /* dijit/form/ToggleButton */
 
-		/* dijit/form/ValidationTextBox */
+        interface ToggleButton extends Button, _ToggleButtonMixin {
+            baseClass: string;
+
+            setChecked(checked: boolean): void;
+        }
 
-		interface IsValidFunction {
-			(isFocused?: boolean): boolean;
-		}
+        interface ToggleButtonConstructor extends _WidgetBaseConstructor<ToggleButton> { }
+
+        /* dijit/form/ValidationTextBox */
+
+        interface IsValidFunction {
+            (isFocused?: boolean): boolean;
+        }
 
-		interface ValidationTextBox<C extends Constraints = Constraints> extends TextBox {
-			templateString: string;
-			required: boolean;
-			promptMessage: string;
-			invalidMessage: string;
-			missingMessage: string;
-			message: string;
-			constraints: C;
-			pattern: string | ConstraintsToRegExpString<C>;
-			regExp: string;
-			regExpGen(constraints: C): void;
-			state: string;
-			tooltipPosition: string[];
-			validator: ConstrainedValidFunction<C>;
-			isValid: IsValidFunction;
-			getErrorMessage(isFocused: boolean): string;
-			getPromptMessage(isFocused: boolean): string;
-			validate(isFocused: boolean): boolean;
-			displayMessage(message: string): void;
-
-			startup(): void;
-			postMixInProperties(): void;
+        interface ValidationTextBox<C extends Constraints = Constraints> extends TextBox {
+            templateString: string;
+            required: boolean;
+            promptMessage: string;
+            invalidMessage: string;
+            missingMessage: string;
+            message: string;
+            constraints: C;
+            pattern: string | ConstraintsToRegExpString<C>;
+            regExp: string;
+            regExpGen(constraints: C): void;
+            state: string;
+            tooltipPosition: string[];
+            validator: ConstrainedValidFunction<C>;
+            isValid: IsValidFunction;
+            getErrorMessage(isFocused: boolean): string;
+            getPromptMessage(isFocused: boolean): string;
+            validate(isFocused: boolean): boolean;
+            displayMessage(message: string): void;
 
-			reset(): void;
+            startup(): void;
+            postMixInProperties(): void;
 
-			destroy(preserveDom?: boolean): void;
+            reset(): void;
 
-			// set(name: 'constraints', value: Constraints): this;
-			// set(name: 'disabled', value: boolean): this;
-			// set(name: 'message', value: string): this;
-			// set(name: 'pattern', value: string | ConstraintsToRegExpString<C>): this;
-			// set(name: 'regExp', value: string): this;
-			// set(name: 'regExpGen', value: Constraints): this;
-			// set(name: 'required', value: boolean): this;
-			// set(name: 'value', value: string): this;
-			// set(name: string, value: any): this;
-			// set(values: Object): this;
+            destroy(preserveDom?: boolean): void;
+        }
 
-			// get(name: 'pattern'): string | ConstraintsToRegExpString<C>;
-			// get(name: string): any;
-		}
-
-		interface ValidationTextBoxConstructor extends _WidgetBaseConstructor<ValidationTextBox<Constraints>> {
-			new <C extends Constraints>(params: Object, srcNodeRef: dojo.NodeOrString): ValidationTextBox<C>;
-		}
-	}
+        interface ValidationTextBoxConstructor extends _WidgetBaseConstructor<ValidationTextBox<Constraints>> {
+            new <C extends Constraints>(params: Object, srcNodeRef: dojo.NodeOrString): ValidationTextBox<C>;
+        }
+    }
 }
diff --git a/dojo-typings/src/main/typings/dijit/modules.d.ts b/dojo-typings/src/main/typings/dijit/modules.d.ts
--- a/dojo-typings/src/main/typings/dijit/modules.d.ts
+++ b/dojo-typings/src/main/typings/dijit/modules.d.ts
@@ -102,6 +102,13 @@ declare module 'dijit/Dialog' {
 	export = Dialog;
 }
 
+declare module "dijit/_HasDropDown" {
+    type _HasDropDown<T extends dijit._WidgetBase = dijit._WidgetBase> = dijit._HasDropDown<T>;
+    const _HasDropDown: dijit._WidgetBaseConstructor<_HasDropDown>;
+
+    export = _HasDropDown;
+}
+
 declare module 'dijit/DropDownMenu' {
 	type DropDownMenu = dijit.DropDownMenu;
 	const DropDownMenu: dijit.DropDownMenuConstructor;
@@ -252,6 +259,18 @@ declare module 'dijit/form/_FormMixin' {
 	export = _FormMixin;
 }
 
+declare module "dijit/form/_FormWidgetMixin" {
+    type _FormWidgetMixin = dijit.form._FormWidgetMixin;
+    const _FormWidgetMixin: dijit._WidgetBaseConstructor<_FormWidgetMixin>;
+    export = _FormWidgetMixin;
+}
+
+declare module "dijit/form/_FormValueMixin" {
+    type _FormValueMixin = dijit.form._FormValueMixin;
+    const _FormValueMixin: dijit._WidgetBaseConstructor<_FormValueMixin>;
+    export = _FormValueMixin;
+}
+
 declare module 'dijit/form/_FormValueWidget' {
 	type _FormValueWidget = dijit.form._FormValueWidget;
 	const _FormValueWidget: dijit.form._FormValueWidgetConstructor;
diff --git a/dojo-typings/src/main/typings/dojo/NodeList-fx.d.ts b/dojo-typings/src/main/typings/dojo/NodeList-fx.d.ts
--- a/dojo-typings/src/main/typings/dojo/NodeList-fx.d.ts
+++ b/dojo-typings/src/main/typings/dojo/NodeList-fx.d.ts
@@ -4,55 +4,67 @@
 
 declare namespace dojo {
 
-	interface NodeListAnimationArgs extends _base.AnimationArguments {
-		auto?: boolean;
-	}
+    interface NodeListAnimationArgs extends Omit<_base.AnimationArguments, "node"> {
+        auto?: false;
+    }
 
-	interface NodeList<T extends Node> {
-		_anim(obj: any, method: string, args?: NodeListAnimationArgs): _base.Animation | this;
+    interface NodeListAutoAnimationArgs extends Omit<_base.AnimationArguments, "node"> {
+        auto: true;
+    }
+
+    interface NodeList<T extends Node> {
 
-		/**
-		 * wipe in all elements of this NodeList via `dojo/fx.wipeIn()`
-		 */
-		wipeIn(args: NodeListAnimationArgs): _base.Animation | this;
+        _anim(obj: any, method: string, args?: NodeListAnimationArgs): _base.Animation;
+        _anim(obj: any, method: string, args: NodeListAutoAnimationArgs): this;
 
-		/**
-		 * wipe out all elements of this NodeList via `dojo/fx.wipeOut()`
-		 */
-		wipeOut(args: NodeListAnimationArgs): _base.Animation | this;
+        /**
+         * wipe in all elements of this NodeList via `dojo/fx.wipeIn()`
+         */
+        wipeIn(args?: NodeListAnimationArgs): _base.Animation;
+        wipeIn(args: NodeListAutoAnimationArgs): this;
 
-		/**
-		 * slide all elements of the node list to the specified place via `dojo/fx.slideTo()`
-		 */
-		slideTo(args: NodeListAnimationArgs): _base.Animation | this;
+        /**
+         * wipe out all elements of this NodeList via `dojo/fx.wipeOut()`
+         */
+        wipeOut(args?: NodeListAnimationArgs): _base.Animation;
+        wipeOut(args: NodeListAutoAnimationArgs): this;
 
-		/**
-		 * fade in all elements of this NodeList via `dojo.fadeIn`
-		 */
-		fadeIn(args: NodeListAnimationArgs): _base.Animation | this;
+        /**
+         * slide all elements of the node list to the specified place via `dojo/fx.slideTo()`
+         */
+        slideTo(args?: NodeListAnimationArgs): _base.Animation;
+        slideTo(args: NodeListAutoAnimationArgs): this;
 
-		/**
-		 * fade out all elements of this NodeList via `dojo.fadeOut`
-		 */
-		fadeOut(args: NodeListAnimationArgs): _base.Animation | this;
+        /**
+         * fade in all elements of this NodeList via `dojo.fadeIn`
+         */
+        fadeIn(args?: NodeListAnimationArgs): _base.Animation;
+        fadeIn(args: NodeListAutoAnimationArgs): this;
 
-		/**
-		 * Animate all elements of this NodeList across the properties specified.
-		 * syntax identical to `dojo.animateProperty`
-		 */
-		animateProperty(args: NodeListAnimationArgs): _base.Animation | this;
+        /**
+         * fade out all elements of this NodeList via `dojo.fadeOut`
+         */
+        fadeOut(args?: NodeListAnimationArgs): _base.Animation;
+        fadeOut(args: NodeListAutoAnimationArgs): this;
 
-		/**
-		 * Animate one or more CSS properties for all nodes in this list.
-		 * The returned animation object will already be playing when it
-		 * is returned. See the docs for `dojo.anim` for full details.
-		 */
-		anim(properties: _base.AnimationArgumentsProperties, duration?: number, easing?: (n?: number) => number, onEnd?: Function, delay?: number): _base.Animation;
-	}
+        /**
+         * Animate all elements of this NodeList across the properties specified.
+         * syntax identical to `dojo.animateProperty`
+         */
+        animateProperty(args?: NodeListAnimationArgs): _base.Animation;
+        animateProperty(args: NodeListAutoAnimationArgs): this;
+
+        /**
+         * Animate one or more CSS properties for all nodes in this list.
+         * The returned animation object will already be playing when it
+         * is returned. See the docs for `dojo.anim` for full details.
+         */
+        anim(properties: _base.AnimationArgumentsProperties, duration?: number, easing?: (n?: number) => number, onEnd?: Function, delay?: number): _base.Animation;
+    }
 }
 
 declare module 'dojo/NodeList-fx' {
-	type NodeList<T extends Node> = dojo.NodeList<T>;
-	const NodeList: dojo.NodeListConstructor;
-	export = NodeList;
+    type NodeList<T extends Node> = dojo.NodeList<T>;
+    const NodeList: dojo.NodeListConstructor;
+    export = NodeList;
 }
diff --git a/dojo-typings/src/main/typings/dojo/dojo.d.ts b/dojo-typings/src/main/typings/dojo/dojo.d.ts
--- a/dojo-typings/src/main/typings/dojo/dojo.d.ts
+++ b/dojo-typings/src/main/typings/dojo/dojo.d.ts
@@ -1726,9 +1726,9 @@ declare namespace dojo {
 	}
 
 	interface NodeListConstructor {
-		new <T extends Node>(array: number | Array<T>): NodeList<T>;
+		new <T extends Node>(array: number | Array<T> | NodeListOf<T>): NodeList<T>;
 		new <T extends Node>(...args: T[]): NodeList<T>;
-		<T extends Node>(array: number | Array<T>): NodeList<T>;
+		<T extends Node>(array: number | Array<T> | NodeListOf<T>): NodeList<T>;
 		<T extends Node>(...args: T[]): NodeList<T>;
 
 		prototype: NodeList<any>;
@@ -1770,6 +1770,9 @@ declare namespace dojo {
 		 * the search by. Returns an instance of NodeList.
 		 */
 		<T extends Node>(query: string, root?: NodeOrString): NodeList<T>;
+        <T extends Node>(root: Node): NodeList<T>;
+
+        NodeList: NodeListConstructor;
 
 		/**
 		 * Test to see if a node matches a selector
diff --git a/dojo-typings/src/test/ts/NodeListFxTests.ts b/dojo-typings/src/test/ts/NodeListFxTests.ts
new file mode 100644
--- /dev/null
+++ b/dojo-typings/src/test/ts/NodeListFxTests.ts
@@ -0,0 +1,8 @@
+import "dojo/NodeList-fx";
+
+declare const nl: dojo.NodeList<Node>;
+
+const anim: dojo._base.Animation = nl.fadeIn();
+const anim2: dojo._base.Animation = nl.fadeIn({duration: 500});
+const nl2: typeof nl = nl.fadeOut({auto: true, onEnd: () => {}});
+const other = nl.fadeOut({auto: false});
\ No newline at end of file
diff --git a/dojo-typings/src/test/tsconfig.json b/dojo-typings/src/test/tsconfig.json
--- a/dojo-typings/src/test/tsconfig.json
+++ b/dojo-typings/src/test/tsconfig.json
@@ -10,7 +10,8 @@
         ],
         "types": [
             "requirejs",
-            "../main/typings"
+            "../main/typings",
+            "../main/typings/dojo/NodeList-fx"
         ],
         "module": "ESNext",
         "target": "ESNext"