forward compatibility with TS2.4 (#575)

dojo · Jun 22, 2017 · a676c30 · a676c30
1 parent 3737d63
commit a676c30
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 30 deletions.
diff --git a/src/Injector.ts b/src/Injector.ts
@@ -3,8 +3,6 @@ import { Evented } from '@dojo/core/Evented';
 import {
 	afterRender,
 	diffProperty,
-	InternalWNode,
-	InternalHNode,
 	WidgetBase
 } from './WidgetBase';
 import { decorate, isHNode, isWNode } from './d';
@@ -70,7 +68,7 @@ export interface InjectorProperties extends WidgetProperties {
 	scope: any;
 	render(): DNode;
 	getProperties?: GetProperties;
-	properties: WidgetProperties;
+	properties: any;
 	getChildren?: GetChildren;
 	children: DNode[];
 }
@@ -108,7 +106,7 @@ export function Injector<C extends Evented, T extends Constructor<BaseInjector<C
 		@afterRender()
 		protected decorateBind(node: DNode): DNode {
 			const { scope } = this.properties;
-			decorate(node, (node: InternalHNode | InternalWNode) => {
+			decorate(node, (node: any) => {
 				const { properties } = node;
 				properties.bind = scope;
 			}, (node: DNode) => { return isHNode(node) || isWNode(node); });

diff --git a/src/WidgetBase.ts b/src/WidgetBase.ts
@@ -21,8 +21,7 @@ import {
 	WidgetMetaConstructor,
 	WidgetBaseConstructor,
 	WidgetBaseInterface,
-	WidgetProperties,
-	WNode
+	WidgetProperties
 } from './interfaces';
 import MetaBase from './meta/Base';
 import RegistryHandler from './RegistryHandler';
@@ -39,17 +38,6 @@ interface WidgetCacheWrapper {
 	used: boolean;
 }
 
-export interface InternalWNode extends WNode {
-	properties: {
-		bind: any;
-	};
-}
-export interface InternalHNode extends HNode {
-	properties: {
-		bind: any;
-	};
-}
-
 enum WidgetRenderState {
 	IDLE = 1,
 	PROPERTIES,
@@ -149,7 +137,7 @@ function isHNodeWithKey(node: DNode): node is HNode {
  * Main widget base for all widgets to extend
  */
 @diffProperty('bind', DiffType.REFERENCE)
-export class WidgetBase<P extends WidgetProperties = WidgetProperties, C extends DNode = DNode> extends Evented implements WidgetBaseInterface<P, C> {
+export class WidgetBase<P = WidgetProperties, C extends DNode = DNode> extends Evented implements WidgetBaseInterface<P, C> {
 
 	/**
 	 * static identifier
@@ -179,7 +167,7 @@ export class WidgetBase<P extends WidgetProperties = WidgetProperties, C extends
 	/**
 	 * internal widget properties
 	 */
-	private  _properties: P;
+	private  _properties: P & WidgetProperties;
 
 	/**
 	 * properties from the previous render
@@ -313,7 +301,7 @@ export class WidgetBase<P extends WidgetProperties = WidgetProperties, C extends
 
 	@afterRender()
 	protected decorateBind(node: DNode | DNode[]): DNode | DNode[] {
-		decorate(node, (node: InternalWNode | InternalHNode) => {
+		decorate(node, (node: any) => {
 			const { properties = {} }: { properties: { bind?: any } } = node;
 			if (!properties.bind) {
 				properties.bind = this;
@@ -376,7 +364,7 @@ export class WidgetBase<P extends WidgetProperties = WidgetProperties, C extends
 		this._nodeMap.set(String(properties.key), <HTMLElement> element);
 	}
 
-	public get properties(): Readonly<P> {
+	public get properties(): Readonly<P> & Readonly<WidgetProperties> {
 		return this._properties;
 	}
 

diff --git a/src/interfaces.d.ts b/src/interfaces.d.ts
@@ -342,13 +342,13 @@ export interface DefaultWidgetBaseInterface extends WidgetBaseInterface<WidgetPr
  * The interface for WidgetBase
  */
 export interface WidgetBaseInterface<
-	P extends WidgetProperties = WidgetProperties,
+	P = WidgetProperties,
 	C extends DNode = DNode<DefaultWidgetBaseInterface>> extends Evented {
 
 	/**
 	 * Widget properties
 	 */
-	readonly properties: P;
+	readonly properties: P & WidgetProperties;
 
 	/**
 	 * Returns the widget's children

diff --git a/tests/unit/WidgetBase.ts b/tests/unit/WidgetBase.ts
@@ -4,7 +4,7 @@ import * as registerSuite from 'intern!object';
 import * as assert from 'intern/chai!assert';
 import { stub, spy, SinonStub } from 'sinon';
 import { v, w, registry } from '../../src/d';
-import { DNode, Render, WidgetProperties } from '../../src/interfaces';
+import { Constructor, DNode, Render } from '../../src/interfaces';
 import {
 	WidgetBase,
 	diffProperty,
@@ -15,7 +15,7 @@ import {
 } from '../../src/WidgetBase';
 import WidgetRegistry, { WIDGET_BASE_TYPE } from './../../src/WidgetRegistry';
 
-interface TestProperties extends WidgetProperties {
+interface TestProperties {
 	id: string;
 	foo: string;
 	bar?: null | string;
@@ -896,7 +896,7 @@ widget.__setProperties__({
 		'async factories only initialise once'() {
 			let resolveFunction: any;
 			const loadFunction = () => {
-				return new Promise((resolve) => {
+				return new Promise<Constructor<WidgetBase>>((resolve) => {
 					resolveFunction = resolve;
 				});
 			};
@@ -944,7 +944,7 @@ widget.__setProperties__({
 		'render with async factory'() {
 			let resolveFunction: any;
 			const loadFunction = () => {
-				return new Promise((resolve) => {
+				return new Promise<Constructor<WidgetBase>>((resolve) => {
 					resolveFunction = resolve;
 				});
 			};

diff --git a/tests/unit/WidgetRegistry.ts b/tests/unit/WidgetRegistry.ts
@@ -81,7 +81,7 @@ registerSuite({
 			const RegistryTestWidget = factoryRegistry.get<TestWidget>('test-widget');
 			assert.isNotNull(RegistryTestWidget);
 			const widget = new RegistryTestWidget!();
-			// demontrates the design time typing
+			// demonstrates the design time typing
 			widget.__setProperties__({ foo: 'bar' });
 		},
 		'throws an error if factory has not been registered.'() {

diff --git a/tests/unit/testIntegration.tsx b/tests/unit/testIntegration.tsx
@@ -1,10 +1,10 @@
 import * as registerSuite from 'intern!object';
 import * as assert from 'intern/chai!assert';
 import { WidgetBase } from '../../src/WidgetBase';
-import { fromRegistry, registry } from '../../src/d';
+import { registry } from '../../src/d';
 import { WidgetProperties } from '../../src/interfaces';
 import { VNode } from '@dojo/interfaces/vdom';
-import * as tsx from './../../src/tsx';
+import { fromRegistry } from './../../src/tsx';
 
 registerSuite({
 	name: 'tsx',