implab/implabjs-dojo-typings Commit - r10:641c326d4bb4

added type parameter to Evented<T>, T is the event map...

cin -

r10:641c326d4bb4 v1.0.2 default

parent child

Context file:

r10:641c326d4bb4

Collapse all files

dojo-typings/src/test/ts/EventedTests.ts created 644 +16 0

@@ -0,0 +1,16
	1	import * as Evented from "dojo/Evented";
	2
	3	interface DoorEvents {
	4	open: { authorized: boolean }
	5	close: void
	6	}
	7
	8	const door = new Evented<DoorEvents>();
	9
	10	door.on("open", evt => evt.authorized);
	11
	12	door.on<any>("location-change", (x,y,z) => x+y+z);
	13
	14	door.emit("open", { authorized: false });
	15	door.emit("close");
	16	door.emit<any>("location-change");

dojo-typings/build.gradle +5 -1

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

dojo-typings/src/main/typings/dijit/dijit.d.ts +3 -18

                     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
                      * Watches a property for changes
                      */
                     watch(callback: <K extends keyof any>(prop: K, oldValue: any, newValue: any) => void): dojo.WatchHandle;
-                    watch<K extends Props<this>>(name: K, callback: (prop: K, oldValue: this[K], newValue: this[K]) => void): dojo.WatchHandle;
+                    watch<K extends keyof this>(name: K, callback: (prop: K, oldValue: this[K], newValue: this[K]) => void): dojo.WatchHandle;
                 }
                 type EventInitArgs<T extends Event> = {
                      * Used by widgets to signal that a synthetic event occurred, ex:
                      * |	myWidget.emit("attrmodified-selectedChildWidget", {}).
                      */
-                    emit<K extends keyof Events>(eventName: K, evt: EventInitArgs<Events[K]>): void;
+                    emit<K extends keyof Events>(eventName: K, evt: EventInitArgs<Events[K]>, callbackArgs?: any[]): any;
-                    /**
-                     * @param type
-                     * @param eventObj
-                     * @param callbackArgs
-                     */
-                    emit<K extends string>(
-                        type: K,
-                        eventObj?: K extends keyof Events ? EventInitArgs<Events[K]> : any,
-                        callbackArgs?: any[]
-                    ): any;
                     /**
                      * Call specified function when event occurs, ex: myWidget.on("click", function(){ ... }).
                      */
                     on<K extends keyof Events>(eventName: K, cb: (evt: Events[K]) => void): dojo.WatchHandle;
-                    on(type: string | dojo.ExtensionEvent, func: dojo.EventListener | Function): dojo.WatchHandle;
+                    on(type: dojo.ExtensionEvent, func: dojo.EventListener): dojo.WatchHandle;
                     /**
                      * Returns a string that represents the widget.

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

                         startup(): void;
                         destroy(preserveDom?: boolean): void;
+                        _setValueAttr(value: any): void;
                     }
                     interface _FormMixinConstructor extends dojo._base.DeclareConstructor<_FormMixin> { }

dojo-typings/src/main/typings/dojo/dojo.d.ts +12 -8

             		/**
             		 * number of decimal places to show.  Default is defined based on which currency is used.
             		 */
-            		places?: number;
+            		places?: string | number;
             	}
             	interface CurrencyParseOptions extends NumberParseOptions {
             		/**
             		 * number of decimal places to show.  Default is defined based on which currency is used.
             		 */
-            		places?: number;
+            		places?: number | string;
             		/**
             		 * Whether to include the fractional portion, where the number of decimal places are implied by the currency
             	/* dojo/Evented */
-            	interface Evented {
+            	interface Evented<EM extends { [e in string]: any; } = any> {
-            		on(type: string | ExtensionEvent, listener: EventListener | Function): Handle;
+                    on<E extends keyof EM>(type: E, listener: (this: this, ...args: EM[E] extends any[] ? EM[E]: [EM[E]]) => void ): Handle;
-            		emit(type: string | ExtensionEvent, ...events: any[]): boolean;
+            		on(type: ExtensionEvent, listener: (...args: any[]) => void): Handle;
+                    emit<E extends keyof EM>(type: E, ...args: EM[E] extends any[] ? EM[E] : [EM[E]] );
+                    emit(type: ExtensionEvent, ...events: any[]): boolean;
             	}
             	interface EventedConstructor extends _base.DeclareConstructor<Evented> {
-            		new (params?: Object): Evented;
+            		new <T>(params?: Object): Evented<T>;
             	}
             	/* dojo/fx */
             		 * fixed number of decimal places to show.  This overrides any
             		 * information in the provided pattern.
             		 */
-            		places?: number;
+            		places?: number | string;
             		/**
             		 * 5 rounds to nearest .5; 0 rounds to nearest whole (default). -1
             		 * not given, the decimal part is optional and the number of places is
             		 * unlimited.
             		 */
-            		places?: number;
+            		places?: number | string;
             		/**
             		 * A string for the character used as the decimal point.  Default

dojo-typings/src/main/typings/dojo/modules.d.ts +1 -1

             }
             declare module 'dojo/Evented' {
-            	type Evented = dojo.Evented;
+            	type Evented<T> = dojo.Evented<T>;
             	const Evented: dojo.EventedConstructor;
             	export = Evented;
             }

dojo-typings/src/test/ts/NodeListFxTests.ts +2 -2

-            import "dojo/NodeList-fx";
+            import * as NodeList from "dojo/NodeList-fx";
-            declare const nl: dojo.NodeList<Node>;
+            const nl: dojo.NodeList<Node> = new NodeList();
             const anim: dojo._base.Animation = nl.fadeIn();
             const anim2: dojo._base.Animation = nl.fadeIn({duration: 500});

dojo-typings/src/test/ts/_WidgetTests.ts +2 -2

             w.emit("click", {} );
-            w.emit("some-extra-event", {});
+            w.emit<any>("some-extra-event", {});
             w.on("click", e => e);
-            w.on("some-extra-event", e => e);
+            w.on<any>("some-extra-event", e => e);

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