implab/implabjs-djx Commit - r71:73341acc489b

Switched to @implab/dojo-typings

cin -

r71:73341acc489b default

parent child

Context file:

r71:73341acc489b

Collapse all files

djx/build.gradle +1 -1

                         "dojo/*" : [ "typings/dojo/*" ],
                         "dijit/*" : [ "typings/dijit/*" ]
                     ]*/
-                    types = ["requirejs", "dojo-typings"]
+                    types = ["requirejs", "@implab/dojo-typings"]
                 }
             }

djx/package-lock.json +13 -19

                         "license": "BSD-2-Clause",
                         "devDependencies": {
                             "@implab/core-amd": "^1.4.0",
+                            "@implab/dojo-typings": "/home/sergey/projects/implabjs-dojo-typings/dojo-typings/build/npm/package/implab-dojo-typings-v1.0.0-rc4.tgz",
                             "@types/chai": "4.1.3",
                             "@types/requirejs": "2.1.31",
                             "@types/yaml": "1.2.0",
                             "chai": "4.2.0",
                             "dojo": "1.16.0",
-                            "dojo-typings": "~1.11.9",
                             "eslint": "6.8.0",
                             "requirejs": "2.3.6",
                             "tslint": "^6.1.3",
                         "integrity": "sha512-gaJX1mhri7YpmXDTAYELZnmTznzXYpk2AI7Decsttdi6xY+bqGgH24q0AFcKrx8RY2jfsFXxDdf0fITz2HpBbw==",
                         "dev": true
                     },
+                    "node_modules/@implab/dojo-typings": {
+                        "version": "v1.0.0-rc4",
+                        "resolved": "file:../../implabjs-dojo-typings/dojo-typings/build/npm/package/implab-dojo-typings-v1.0.0-rc4.tgz",
+                        "integrity": "sha512-whWA/3shw3j4WFdmh5ml9BYZMj4KFruv1YXtz29W0LXMNpmj5nyyM8FJYYCdtvWJEGvnEUcUCQ0zsZ+Gh5ah9Q==",
+                        "dev": true,
+                        "license": "MIT"
+                    },
                     "node_modules/@types/chai": {
                         "version": "4.1.3",
                         "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.1.3.tgz",
                         "integrity": "sha512-DUiXyoLK6vMF5BPr/qiMLTxDMfiM9qlzN1jxfDsVfuvB/CwhYpNxA/M4mbqKN8PCVGLmccXBJbfmFJPP5+zmzw==",
                         "dev": true
                     },
-                    "node_modules/dojo-typings": {
-                        "version": "1.11.9",
-                        "resolved": "https://registry.npmjs.org/dojo-typings/-/dojo-typings-1.11.9.tgz",
-                        "integrity": "sha512-mh8w+Mau2Y1QfTEszEAdO7j6ycNhYxF/Ing6nAk1eUg6NxjeT0viVHjICMd9sU3U463vM2G+KfBBK5grk3/Mlw==",
-                        "dev": true,
-                        "dependencies": {
-                            "@types/chai": "^4.0.4"
-                    },
                     "node_modules/emoji-regex": {
                         "version": "8.0.0",
                         "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
                         "integrity": "sha512-gaJX1mhri7YpmXDTAYELZnmTznzXYpk2AI7Decsttdi6xY+bqGgH24q0AFcKrx8RY2jfsFXxDdf0fITz2HpBbw==",
                         "dev": true
                     },
+                    "@implab/dojo-typings": {
+                        "version": "file:/home/sergey/projects/implabjs-dojo-typings/dojo-typings/build/npm/package/implab-dojo-typings-v1.0.0-rc4.tgz",
+                        "integrity": "sha512-whWA/3shw3j4WFdmh5ml9BYZMj4KFruv1YXtz29W0LXMNpmj5nyyM8FJYYCdtvWJEGvnEUcUCQ0zsZ+Gh5ah9Q==",
+                        "dev": true
+                    },
                     "@types/chai": {
                         "version": "4.1.3",
                         "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.1.3.tgz",
                         "integrity": "sha512-DUiXyoLK6vMF5BPr/qiMLTxDMfiM9qlzN1jxfDsVfuvB/CwhYpNxA/M4mbqKN8PCVGLmccXBJbfmFJPP5+zmzw==",
                         "dev": true
                     },
-                    "dojo-typings": {
-                        "version": "1.11.9",
-                        "resolved": "https://registry.npmjs.org/dojo-typings/-/dojo-typings-1.11.9.tgz",
-                        "integrity": "sha512-mh8w+Mau2Y1QfTEszEAdO7j6ycNhYxF/Ing6nAk1eUg6NxjeT0viVHjICMd9sU3U463vM2G+KfBBK5grk3/Mlw==",
-                        "dev": true,
-                        "requires": {
-                            "@types/chai": "^4.0.4"
-                    },
                     "emoji-regex": {
                         "version": "8.0.0",
                         "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",

djx/package.json +1 -1

                     "@types/yaml": "1.2.0",
                     "chai": "4.2.0",
                     "dojo": "1.16.0",
-                    "dojo-typings": "~1.11.9",
+                    "@implab/dojo-typings": "/home/sergey/projects/implabjs-dojo-typings/dojo-typings/build/npm/package/implab-dojo-typings-v1.0.0-rc4.tgz",
                     "eslint": "6.8.0",
                     "requirejs": "2.3.6",
                     "tslint": "^6.1.3",

djx/src/main/ts/declare.ts +1 -1

                     // t - базовый класс, объявленный при помощи dojo/_base/declare
                     const t = bc.bases;
-                    const cls = declare(bc.bases, target.prototype);
+                    const cls = declare<any>(bc.bases, target.prototype);
                     // bc - базовый класс, bc.prototype используется как super
                     // при вызове базовых методов. Нужно создать bc.prototype

djx/src/main/ts/tsx/DjxWidgetBase.ts +9 -11

-            import { djbase, djclass } from "../declare";
+            import { AbstractConstructor, djbase, djclass } from "../declare";
             import _WidgetBase = require("dijit/_WidgetBase");
             import _AttachMixin = require("dijit/_AttachMixin");
             import { Rendition, isNode, startupWidgets } from "./traits";
                 composed?: boolean;
             }
-            export interface DjxWidgetBase<Attrs = any, Events extends { [name in keyof Events]: Event } = any> {
+            export interface DjxWidgetBase<Attrs = {}, Events extends { [name in keyof Events]: Event } = {}> extends
-                set<K extends keyof Attrs & string>(key: K, value: Attrs[K]): this;
+                _WidgetBase<Events> {
-                set(props: Partial<Attrs>): this;
-                get<K extends keyof Attrs & string>(key: K): Attrs[K];
-                on<K extends keyof Events & string>(eventName: K, cb: (evt: Events[K]) => void): dojo.WatchHandle;
+            type _super = {
+                startup(): void;
-                emit<K extends keyof Events & string>(eventName: K, evt: Omit<Events[K], keyof Event> & EventArgs): void;
             }
             @djclass
-            export abstract class DjxWidgetBase<Attrs = any, Events = any> extends djbase(_WidgetBase, _AttachMixin) {
+            export abstract class DjxWidgetBase<Attrs = {}, Events = {}> extends djbase<_super, _AttachMixin>(_WidgetBase, _AttachMixin) {
                 buildRendering() {
                     this.domNode = this.render().getDomNode();
                 _processTemplateNode<T extends (Element | Node | _WidgetBase)>(
                     baseNode: T,
-                    getAttrFunc: (baseNode: T, attr: string) => string,
+                    getAttrFunc: (baseNode: T, attr: string) => any,
                     // tslint:disable-next-line: ban-types
                     attachFunc: (node: T, type: string, func?: Function) => dojo.Handle
                 ): boolean {
                         if (w) {
                             // from dijit/_WidgetsInTemplateMixin
                             this._processTemplateNode(w,
-                                (n, p) => n.get(p), // callback to get a property of a widget
+                                (n, p) => n.get(p as any), // callback to get a property of a widget
                                 (widget, type, callback) => {
                                     if (!callback)
                                         throw new Error("The callback must be specified");

djx/src/main/ts/tsx/traits.ts +58 -2

@@ -1,8 +1,10
1	import { IDestroyable } from "@implab/core-amd/interfaces";	1	import { IDestroyable, IRemovable } from "@implab/core-amd/interfaces";
2	import { isDestroyable } from "@implab/core-amd/safe";	2	import { isDestroyable } from "@implab/core-amd/safe";
3	import _WidgetBase = require("dijit/_WidgetBase");	3	import _WidgetBase = require("dijit/_WidgetBase");
4	import registry = require("dijit/registry");	4	import registry = require("dijit/registry");
5	import dom = require("dojo/dom-construct");	5	import dom = require("dojo/dom-construct");
		6	import Stateful = require("dojo/Stateful");
		7	import { FunctionRendition } from "./FunctionRendition";
6		8
7	type _WidgetBaseConstructor = typeof _WidgetBase;	9	type _WidgetBaseConstructor = typeof _WidgetBase;
8		10
@@ -145,4 +147,58 export function startupWidgets(target: N
145	if(target.startup)	147	if(target.startup)
146	target.startup();	148	target.startup();
147	}	149	}
148	} No newline at end of file	150	}
		151
		152
		153	type StatefulProps<T> = T extends Stateful<infer A> ? A : never;
		154
		155	type CleanFn = (instance: IRemovable \| IDestroyable) => void;
		156
		157	/**
		158	* Observers the property and calls render callback each change.
		159	*
		160	* @param target The target object which property will be observed.
		161	* @param prop The name of the property.
		162	* @param render The callback which will be called every time the value is changed
		163	* @param cleanupOrOwner The object with method `own` or an callback to register lifecycle for the observer.
		164	* @returns Rendition which is created instantly
		165	*/
		166	export function watch<W extends _WidgetBase, K extends keyof W> (
		167	target: W,
		168	prop: K,
		169	render: (model: W[K]) => any,
		170	cleanupOrOwner?: {own: CleanFn} \| CleanFn
		171	): Rendition;
		172	/**
		173	* Observers the property and calls render callback each change.
		174	*
		175	* @param target The target object which property will be observed.
		176	* @param prop The name of the property.
		177	* @param render The callback which will be called every time the value is changed
		178	* @param cleanupOrOwner The object with method `own` or an callback to register lifecycle for the observer.
		179	* @returns Rendition which is created instantly
		180	*/
		181	export function watch<T extends Stateful, K extends keyof StatefulProps<T>>(
		182	target: T,
		183	prop: K,
		184	render: (model: StatefulProps<T>[K]) => any,
		185	cleanupOrOwner?: {own: CleanFn} \| CleanFn
		186	): Rendition;
		187	export function watch<T extends Stateful, K extends keyof StatefulProps<T> & string>(
		188	target: T,
		189	prop: K,
		190	render: (model: StatefulProps<T>[K]) => any,
		191	cleanupOrOwner: {own: CleanFn} \| CleanFn = () => {}
		192	) {
		193	let rendition = new FunctionRendition(() => render(target.get(prop)));
		194	const _own = cleanupOrOwner instanceof Function ? cleanupOrOwner : (x: IRemovable) => cleanupOrOwner.own(x)
		195	_own(target.watch(prop, (_name, oldValue, newValue) => {
		196	if (oldValue !== newValue) {
		197	const newRendition = new FunctionRendition(() => render(newValue));
		198	newRendition.placeAt(rendition.getDomNode(), "replace");
		199	destroy(rendition.getDomNode());
		200	rendition = newRendition;
		201	}
		202	}));
		203	return rendition;
		204	}

djx/src/main/tsconfig.json +1 -1

                         "typings"
                     ],
                     "types": [
-                        "requirejs", "./typings", "dojo-typings"
+                        "requirejs", "./typings", "@implab/dojo-typings"
                     ]
                 }
             }

djx/src/main/typings/dijit.d.ts 0 -14

	@@ -1,14 +0,0
	1	declare namespace dijit {
	2	interface _WidgetBase {
	3
	4	_started?: boolean;
	5
	6	_set<K extends keyof this>(key: K, value: this[K]): void;
	7	}
	8
	9	interface TooltipDialog {
	10
	11	content: any;
	12
	13	}
	14	}

djx/src/test/ts/view/MyWidget.tsx +9 -4

             }
             interface MyWidgetEvents {
-                "count-inc": Event;
+                "count-inc": Event & {
+                    detail: number;
+                };
-                "count-dec": Event;
+                "count-dec": Event & {
+                    detail: number;
+                };
             }
                 }
                 _onSubmit(e: Event) {
                 }
                 _onIncClick(e: MouseEvent) {
+                    this.set("counter", this.counter+1);
                     this.emit("count-inc", { bubbles: false });
                 }
                 _onDecClick() {
-                    this.emit("count-dec", { bubbles: false });
+                    this.emit("count-dec", { bubbles: false, detail: this.counter });
                 }
             }

djx/src/test/tsconfig.json +1 -1

                         "../main/ts",
                         "../main/typings"
                     ],
-                    "types": ["requirejs", "../main/typings", "dojo-typings"]
+                    "types": ["requirejs", "../main/typings", "@implab/dojo-typings"]
                 }
             }

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