From 17c00c56fe371271f671dfdff82f4a5f19019ebe Mon Sep 17 00:00:00 2001
From: hhh <1340545944@qq.com>
Date: Thu, 24 Jan 2019 20:05:00 +0800
Subject: [PATCH] improve type declarations

---
 src/core/HNode.ts    | 50 +++++++++++++++++++++++++++-----------------
 src/core/HUI.ts      | 10 ++++-----
 src/core/registry.ts |  7 ++++---
 test/src/Timer.tsx   |  6 +++++-
 4 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/src/core/HNode.ts b/src/core/HNode.ts
index 35adc0f..1dd8df4 100644
--- a/src/core/HNode.ts
+++ b/src/core/HNode.ts
@@ -9,33 +9,45 @@ import { EventMap } from "./events";
 
 type ArrayWrapped<T> = T extends any[] ? T : [T];
 
-export type HProps<P extends object = any> = Required<{
-    [K in keyof P]: K extends 'children' ?
-    /**/P extends { children: any } ?
-    /******/ArrayWrapped<P['children']> :
-    /******/P extends { children?: any } ?
-    /**********/ArrayWrapped<P['children']> | undefined :
-    /**********/unknown[] :
-    /**/P[K];
-}> & ('children' extends keyof P ? {} : { children: unknown[] });
-
-export interface HDesc<P extends object = any, S extends object = any, C extends object = any, SH extends HandlerMap<S> = any, CH extends HandlerMap<C> = any> {
-    defaultProps?: Partial<P>;
+export type HProps<P extends object = any, DP extends Partial<P> = {}> = {
+    [K in keyof P]-?: K extends 'children' ? (
+        P extends { children: any } ? (
+            ArrayWrapped<P['children']>
+        ) : (
+            P extends { children?: any } ? (
+                ArrayWrapped<P['children']> | undefined
+            ) : (
+                unknown[]
+            )
+        )
+    ) : (
+        K extends keyof DP ? (
+            Exclude<P[K], undefined>
+        ) : (
+            P[K] | undefined
+        )
+    );
+} & ('children' extends keyof P ? {} : {
+    children: unknown[];
+});
+
+export interface HDesc<P extends object = any, S extends object = any, C extends object = any, SH extends HandlerMap<S> = any, CH extends HandlerMap<C> = any, DP extends Partial<P> = {}> {
+    defaultProps?: DP;
     defaultStore?: Partial<S>;
     storeHandlers?: PartialHandlers<SH, Store<S>>;
     state?: Array<keyof S>;
     context?: Array<keyof C>;
-    init?: (this: HNode<P, S, C>, props: HProps<P>, store: Store<S, SH>, context: Store<C, CH>) => void;
-    render: (this: HNode<P, S, C>, props: HProps<P>, store: Store<S, SH>, context: Store<C, CH>) => unknown;
-    clear?: (this: HNode<P, S, C>, props: HProps<P>, store: Store<S, SH>, context: Store<C, CH>) => void;
-    catch?: (this: HNode<P, S, C>, err: any, props: HProps<P>, store: Store<S, SH>, context: Store<C, CH>) => unknown;
+    init?: (this: HNode<P, S, C, SH, CH, DP>, props: HProps<P, DP>, store: Store<S, SH>, context: Store<C, CH>) => void;
+    render: (this: HNode<P, S, C, SH, CH, DP>, props: HProps<P, DP>, store: Store<S, SH>, context: Store<C, CH>) => unknown;
+    clear?: (this: HNode<P, S, C, SH, CH, DP>, props: HProps<P, DP>, store: Store<S, SH>, context: Store<C, CH>) => void;
+    catch?: (this: HNode<P, S, C, SH, CH, DP>, err: any, props: HProps<P, DP>, store: Store<S, SH>, context: Store<C, CH>) => unknown;
 }
 
-export interface HNode<P extends object = EleProps, S extends object = any, C extends object = any, SH extends HandlerMap<S> = any, CH extends HandlerMap<C> = any> {
+export interface HNode<P extends object = EleProps, S extends object = any, C extends object = any, SH extends HandlerMap<S> = any, CH extends HandlerMap<C> = any, DP extends Partial<P> = {}> {
     isHN: true;
     type: unknown;
-    desc?: HDesc<P, S, C, SH, CH>;
-    props: HProps<P>;
+    desc?: HDesc<P, S, C, SH, CH, DP>;
+    props: HProps<P, DP>;
     sto?: Store<S, SH>;
     ctx?: Store<C, CH>;
     owner?: HNode<any>;
diff --git a/src/core/HUI.ts b/src/core/HUI.ts
index 4af0b20..72d16d4 100644
--- a/src/core/HUI.ts
+++ b/src/core/HUI.ts
@@ -1,7 +1,7 @@
 import { HNode, HProps } from "./HNode";
 import { registry, define, HType } from "./registry";
 import { _assign, _Infinity, _requestAnimationFrame } from "../utils/refCache";
-import { createStore } from "./Store";
+import { createStore, HandlerMap } from "./Store";
 import { renderToDOM } from "./render";
 import { propHandlers, EleProps } from "./propHandlers";
 import { Portal } from "../ext/Portal";
@@ -10,13 +10,13 @@ import { compare } from "../utils/cmp";
 import { Fragment } from "../ext/Fragment";
 import { noCmpProps } from "../ticker/patch";
 
-export const HUI = <P extends object = EleProps, S extends object = any, C extends object = any>(
-    type: HType<P, S, C> | string, props?: P | null, ...children: unknown[]
-): HNode<P, S, C> => ({
+export const HUI = <P extends object = EleProps, S extends object = any, C extends object = any, SH extends HandlerMap<S> = any, CH extends HandlerMap<C> = any, DP extends Partial<P> = {}>(
+    type: HType<P, S, C, SH, CH> | string, props?: P | null, ...children: unknown[]
+): HNode<P, S, C, SH, CH, DP> => ({
     isHN: true,
     type,
     desc: registry.get(type),
-    props: _assign({ children: children.flat(_Infinity) }, props) as HProps<P>,
+    props: _assign({ children: children.flat(_Infinity) }, props) as unknown as HProps<P, DP>,
     active: true
 });
 
diff --git a/src/core/registry.ts b/src/core/registry.ts
index 49aec67..f225d6b 100644
--- a/src/core/registry.ts
+++ b/src/core/registry.ts
@@ -6,15 +6,16 @@ export interface HType<P extends object = any, S extends object = any, C extends
     (props: P, store: Store<S, SH>, context: Store<C, CH>): any;
 };
 
-export const registry = new _Map<HType<any> | string, HDesc<any>>();
+export const registry = new _Map<HType<any, any, any, any, any> | string, HDesc<any, any, any, any, any, any>>();
 
 export const define = function <
     P extends object = any,
     S extends object = any,
     C extends object = any,
     SH extends HandlerMap<S> = any,
-    CH extends HandlerMap<C> = any
->(name: string, desc: HDesc<P, S, C, SH, CH>): HType<P, S, C, SH, CH> {
+    CH extends HandlerMap<C> = any,
+    DP extends Partial<P> = {}
+>(name: string, desc: HDesc<P, S, C, SH, CH, DP>): HType<P, S, C, SH, CH> {
 
     const type = _Symbol(name) as unknown as HType<P, S, C, SH, CH>;
 
diff --git a/test/src/Timer.tsx b/test/src/Timer.tsx
index 65e8cb5..b8bf185 100644
--- a/test/src/Timer.tsx
+++ b/test/src/Timer.tsx
@@ -11,7 +11,11 @@ type TimerStoreHandlers = {
     setInterval: (interval: number) => any;
 }
 
-const Timer = HUI.define<TimerProps, TimerStore, {}, TimerStoreHandlers>('Timer', {
+interface TimerDefaultProps {
+    start: number;
+}
+
+const Timer = HUI.define<TimerProps, TimerStore, {}, TimerStoreHandlers, {}, TimerDefaultProps>('Timer', {
 
     state: ['time'],