implab/implabjs-dojo-typings Commit - r5:af2703f9110e

some fixes after testing

cin -

r5:af2703f9110e default

parent child

Context file:

r5:af2703f9110e

Collapse all files

dojo-typings/build.gradle +3 -1

             configureTsTest {
                 compilerOptions {
-                    types = ["../main/typings/dojo/modules","../main/typings/dijit/modules"];
+                    types = ["../main/typings/dojo/modules","../main/typings/dijit/modules"]
+                    module = "ESNext"
+                    it.target = "ESNext"
                 }
             }

dojo-typings/src/main/typings/dijit/dijit.d.ts +9 -5

                     onClose(): boolean;
                 }
+                type Props<T> = {
+                    [k in Exclude<keyof T, keyof object>] : T[k] extends (...args: any) => any ? never: k;
+                }[ keyof T];
                 interface _WidgetBase {
                     /**
                      * Used across all instances a hash to cache attribute names and their getter
                      */
                     _changeAttrValue(name: string, value: any): this;
-                    get<K extends keyof this & string>(name: K): this[K];
+                    get<K extends keyof this>(name: K): this[K];
                     /**
                      * Helper function to set new value for specified property, and call handlers
                     /**
                      * Set a property on a Stateful instance
                      */
-                    set<K extends keyof this & string>(name: K, value: this[K]): this;
+                    set<K extends keyof this>(name: K, value: this[K]): this;
-                    set<K extends { [p in keyof this]: this[p] extends any[] ? p : never; }[keyof this & string]>(name: K, ...values: this[K]): this;
+                    set<K extends keyof this, V extends this[K] & any[]>(name: K, ...values: V): this;
-                    set(values: Partial<this>): this;
+                    set<K extends keyof this>(values: {[p in K]: this[p]}): this;
                     /**
                      * Watches a property for changes
                      */
                     watch(callback: <K extends keyof any>(prop: K, oldValue: any, newValue: any) => void): dojo.WatchHandle;
-                    watch<K extends keyof this>(name: K, callback: (prop: K, oldValue: this[K], newValue: this[K]) => void): dojo.WatchHandle;
+                    watch<K extends Props<this>>(name: K, callback: (prop: K, oldValue: this[K], newValue: this[K]) => void): dojo.WatchHandle;
                 }
                 type EventInitArgs<T extends Event> = {

dojo-typings/src/main/typings/dijit/form.d.ts +16 -16

             			[prop: string]: any;
             		}
-            		interface ConstrainedValueFunction<V, C extends Constraints, 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
             			(value: V, constraints: C): T;
             		}
-            		interface ConstrainedValidFunction<C extends Constraints> {
+            		interface ConstrainedValidFunction<C extends Constraints = Constraints> {
             			/**
             			 * Returns true if the value is valid based on the constraints, otherwise
             			 * returns false.
             			(value: any, constraints: C): boolean;
             		}
-            		interface ConstraintsToRegExpString<C extends Constraints> {
+            		interface ConstraintsToRegExpString<C extends Constraints = Constraints> {
             			/**
             			 * Takes a set of constraints and returns a RegExpString that can be used
             			 * to match values against
             		/* dijit/form/_AutoCompleterMixin */
             		/* tslint:disable:class-name */
-            		interface _AutoCompleterMixin<T extends Object, Q extends dojo.store.api.BaseQueryType, O extends dojo.store.api.QueryOptions> extends _SearchMixin<T, Q, O> {
+            		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.
             		/* dijit/form/_ComboBoxMenu */
-            		interface _ComboBoxMenu<T> extends _WidgetBase, _TemplatedMixin, _ListMouseMixin, _ComboBoxMenuMixin<T> {
+            		interface _ComboBoxMenu<T = any> extends _WidgetBase, _TemplatedMixin, _ListMouseMixin, _ComboBoxMenuMixin<T> {
             			templateString: string;
             			baseClass: string;
             		}
             		interface _ComboBoxMenuConstructor extends _WidgetBaseConstructor<_ComboBoxMenu<any>> {
-            			new <T>(params: Object, srcNodeRef: dojo.NodeOrString): _ComboBoxMenu<T>;
+            			new <T = any>(params: Object, srcNodeRef: dojo.NodeOrString): _ComboBoxMenu<T>;
             		}
             		/* dijit/form/_ComboBoxMenuMixin */
-            		interface _ComboBoxMenuMixin<T> {
+            		interface _ComboBoxMenuMixin<T = any> {
             			/**
             			 * Holds "next" and "previous" text for paging buttons on drop down
             			 */
             			disabled?: boolean;
             		}
-            		interface _FormSelectWidget<T extends Object, Q extends dojo.store.api.BaseQueryType, O extends dojo.store.api.QueryOptions> extends _FormValueWidget {
+            		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
             			 */
             		/* dijit/form/_SearchMixin */
-            		interface _SearchMixin<T extends Object, Q extends dojo.store.api.BaseQueryType, O extends dojo.store.api.QueryOptions> {
+            		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
             		/* dijit/form/_TextBoxMixin */
-            		interface _TextBoxMixin<C extends Constraints> {
+            		interface _TextBoxMixin<C extends Constraints = Constraints> {
             			/**
             			 * Removes leading and trailing whitespace if true.  Default is false.
             			 */
             		/* dijit/form/ComboBox */
-            		interface ComboBox<T extends Object, Q extends dojo.store.api.BaseQueryType, O extends dojo.store.api.QueryOptions, C extends Constraints> extends ValidationTextBox<C>, ComboBoxMixin<T, Q, O> {
+            		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 ComboBoxConstructor extends _WidgetBaseConstructor<ComboBox<any, any, any, any>> {
+            		interface ComboBoxConstructor extends _WidgetBaseConstructor<ComboBox<any>> {
-            			new <T extends Object, Q extends dojo.store.api.BaseQueryType, O extends dojo.store.api.QueryOptions, C extends Constraints>(params: Object, srcNodeRef: dojo.NodeOrString): ComboBox<T, Q, O, C>;
+            			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, Q extends dojo.store.api.BaseQueryType, O extends dojo.store.api.QueryOptions> extends _HasDropDown<_ComboBoxMenu<T>>, _AutoCompleterMixin<T, Q, O> {
+            		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> {
             			/**
             			 * Dropdown widget class used to select a date/time.
             			buildRendering(): void;
             		}
-            		interface ComboBoxMixinConstructor<T, U extends dojo.store.api.BaseQueryType, V> extends _WidgetBaseConstructor<ComboBoxMixin<T, U, V>> { }
+            		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 */
             			(isFocused?: boolean): boolean;
             		}
-            		interface ValidationTextBox<C extends Constraints> extends TextBox {
+            		interface ValidationTextBox<C extends Constraints = Constraints> extends TextBox {
             			templateString: string;
             			required: boolean;
             			promptMessage: string;

dojo-typings/src/main/typings/dijit/layout.d.ts +1 -1

             			 * Note that the initialization parameter / argument to set("content", ...
             			 * can be a String, DomNode, Nodelist, or _Widget.
             			 */
-            			content: dojo.ContentSetterContent | dijit._Widget;
+            			content: any;
             			/**
             			 * Extract visible content from inside of `<body> .... </body>`

dojo-typings/src/main/typings/dijit/modules.d.ts +4 -4

             }
             declare module 'dijit/form/ComboBoxMixin' {
-            	type ComboBoxMixin<T, U extends dojo.store.api.BaseQueryType, V> = dijit.form.ComboBoxMixin<T, U, V>;
+            	type ComboBoxMixin<T = any, U extends dojo.store.api.BaseQueryType = dojo.store.api.BaseQueryType, V = any> = dijit.form.ComboBoxMixin<T, U, V>;
             	const ComboBoxMixin: dijit.form.ComboBoxConstructor;
             	export = ComboBoxMixin;
             }
             }
             declare module 'dijit/form/MappedTextBox' {
-            	type MappedTextBox<C extends dijit.form.Constraints> = dijit.form.MappedTextBox<C>;
+            	type MappedTextBox<C extends dijit.form.Constraints = dijit.form.Constraints> = dijit.form.MappedTextBox<C>;
             	const MappedTextBox: dijit.form.MappedTextBoxConstructor;
             	export = MappedTextBox;
             }
             }
             declare module 'dijit/form/Select' {
-            	type Select<T, Q extends dojo.store.api.BaseQueryType, O, U extends dijit._WidgetBase> = dijit.form.Select<T, Q, O, U>;
+            	type Select<T, Q extends dojo.store.api.BaseQueryType = dojo.store.api.BaseQueryType, O = any, U extends dijit._WidgetBase = dijit._WidgetBase> = dijit.form.Select<T, Q, O, U>;
             	const Select: dijit.form.SelectConstructor;
             	export = Select;
             }
             }
             declare module 'dijit/form/ValidationTextBox' {
-            	type ValidationTextBox<C extends dijit.form.Constraints> = dijit.form.ValidationTextBox<C>;
+            	type ValidationTextBox<C extends dijit.form.Constraints = dijit.form.Constraints> = dijit.form.ValidationTextBox<C>;
             	const ValidationTextBox: dijit.form.ValidationTextBoxConstructor;
             	export = ValidationTextBox;
             }

dojo-typings/src/test/ts/_WidgetTests.ts +19 -1

@@ -14,14 +14,32 interface ScheduleWidgetEvents {
14	};	14	};
15	}	15	}
16		16
17	~~declare~~ class ScheduleWidget extends _WidgetBase<ScheduleWidgetAttrs, ScheduleWidgetEvents> {	17	class ScheduleWidget extends _WidgetBase<ScheduleWidgetAttrs, ScheduleWidgetEvents> {
18	data: string[];	18	data: string[];
		19
		20	_onClick() {
		21	this.set("data", "", "");
		22
		23	const t = this.get("title");
		24	this.set({
		25	data: ["",""]
		26	});
		27	}
		28
		29	render(){
		30	watch(this, "title", v => String(v) );
		31	}
19	}	32	}
20		33
21	const w = new ScheduleWidget({title: "Year schedule", data: ["a", "b"] });	34	const w = new ScheduleWidget({title: "Year schedule", data: ["a", "b"] });
22		35
23	w.get("data");	36	w.get("data");
24		37
		38	w.set("data", "a","b");
		39	w.set({
		40	data: ["a", "b"]
		41	});
		42
25	w.watch((p, o, n) => [p,o,n]);	43	w.watch((p, o, n) => [p,o,n]);
26		44
27	w.watch("data", (p, o, n) => [p,o,n]);	45	w.watch("data", (p, o, n) => [p,o,n]);

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages