Create templates based on the Data and Api type of a widget

package.json

@@ -88,7 +88,7 @@
     "rimraf": "~2.6.2",
     "selenium-webdriver": "3.6.0",
     "sinon": "~4.1.3",
-    "typescript": "3.4.5"
+    "typescript": "3.5.3"
   },
   "lint-staged": {
     "*.{ts,tsx,md}": [

src/core/middleware/resources.ts

@@ -3,6 +3,7 @@ import Map from '../../shim/Map';
 import { create, invalidator, diffProperty, destroy } from '../vdom';
 import icache from './icache';
 import { auto } from '../diff';
+import { DefaultChildrenWNodeFactory, WNodeFactory, OptionalWNodeFactory, WNodeFactoryTypes } from '../interfaces';
 
 export interface ReadQuery {
 	[index: string]: any;
@@ -239,6 +240,54 @@ export function defaultFilter(query: ReadQuery, item: any, type: string = 'conta
 	return true;
 }
 
+type WidgetFactory<T extends WNodeFactoryTypes> =
+	| DefaultChildrenWNodeFactory<T>
+	| WNodeFactory<T>
+	| OptionalWNodeFactory<T>;
+
+type WidgetResourceData<W extends WidgetFactory<any>> = W extends WidgetFactory<
+	WNodeFactoryTypes<ResourceProperties<infer D, any>>
+>
+	? D
+	: void;
+type WidgetResourceApi<W extends WidgetFactory<any>> = W extends WidgetFactory<
+	WNodeFactoryTypes<ResourceProperties<infer D, infer R>>
+>
+	? R extends CustomTemplate ? R : DefaultApi
+	: DefaultApi;
+type WidgetResourceTemplateApi<W extends WidgetFactory<any>> = W extends WidgetFactory<
+	WNodeFactoryTypes<ResourceProperties<infer D, infer R>>
+>
+	? R extends CustomTemplate ? CustomTemplateApi<R, D> : CustomTemplateApi<DefaultApi, D>
+	: CustomTemplateApi<DefaultApi, WidgetResourceData<W>>;
+
+export function createResourceTemplate<
+	W extends WidgetFactory<any>,
+	T extends TemplateFactory<
+		WidgetResourceData<W>,
+		any,
+		CustomTemplateApi<WidgetResourceApi<W>, WidgetResourceData<W>>
+	>
+>(
+	widget: W,
+	template: T
+): T extends TemplateFactory<any, infer O, any>
+	? TemplateWithOptionsFactory<WidgetResourceData<W>, O, WidgetResourceApi<W>>
+	: void;
+export function createResourceTemplate<W extends WidgetFactory<any>>(
+	widget: W,
+	template: Template<WidgetResourceData<W>> & WidgetResourceTemplateApi<W>
+): {
+	template: {
+		template: () => Template<WidgetResourceData<W>>;
+		templateOptions: any;
+		api: WidgetResourceApi<W>;
+	};
+};
+export function createResourceTemplate<W extends WidgetFactory<any>>(
+	widget: W,
+	idKey: keyof WidgetResourceData<W>
+): TemplateWithOptionsFactory<WidgetResourceData<W>, { data: WidgetResourceData<W>[] }, DefaultApi>;
 export function createResourceTemplate<RESOURCE_DATA, TEMPLATE extends CustomTemplate = DefaultApi>(
 	template: Template<RESOURCE_DATA> & CustomTemplateApi<TEMPLATE, RESOURCE_DATA>
 ): {
@@ -254,7 +303,8 @@ export function createResourceTemplate<RESOURCE_DATA, OPTIONS, TEMPLATE extends
 export function createResourceTemplate<RESOURCE_DATA>(
 	idKey: keyof RESOURCE_DATA
 ): TemplateWithOptionsFactory<RESOURCE_DATA, { data: RESOURCE_DATA[] }, DefaultApi>;
-export function createResourceTemplate<RESOURCE_DATA>(template?: any): any {
+export function createResourceTemplate<RESOURCE_DATA>(templateOrWidget: any, template?: any): any {
+	template = template || templateOrWidget;
 	if (typeof template === 'function') {
 		return (templateOptions: any) => {
 			return {

src/testing/renderer.ts

@@ -95,11 +95,11 @@ export interface DecoratorResult<T> {
 	nodes: T;
 }
 
-function isWrappedNode(value: any): value is (WNode & { id: string }) | (WNode & { id: string }) {
+function isWrappedNode(value: any): value is Wrapped<any> {
 	return Boolean(value && value.id && (isWNode(value) || isVNode(value)));
 }
 
-function findNode<T extends Wrapped<any>>(renderResult: RenderResult, wrapped: T): VNode | WNode {
+function findNode(renderResult: RenderResult, wrapped: Wrapped<any>): VNode | WNode {
 	renderResult = decorateNodes(renderResult).nodes;
 	let nodes: any[] = Array.isArray(renderResult) ? [...renderResult] : [renderResult];
 	while (nodes.length) {

tests/core/unit/middleware/inert.ts

@@ -4,10 +4,11 @@ const { describe: jsdomDescribe } = intern.getPlugin('jsdom');
 const { assert } = intern.getPlugin('chai');
 import { stub } from 'sinon';
 
-import icacheMiddleware from '../../../../src/core/middleware/icache';
+import { createICacheMiddleware } from '../../../../src/core/middleware/icache';
 import inertMiddleware from '../../../../src/core/middleware/inert';
 
 let invalidatorStub = stub();
+const icacheMiddleware = createICacheMiddleware<any>();
 
 jsdomDescribe('inert middleware', () => {
 	let icache = icacheMiddleware().callback({