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

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

diff --git a/src/core/HNode.ts b/src/core/HNode.ts
index 1dd8df4..1e30cc2 100644
--- a/src/core/HNode.ts
+++ b/src/core/HNode.ts
@@ -9,8 +9,8 @@ import { EventMap } from "./events";
 
 type ArrayWrapped<T> = T extends any[] ? T : [T];
 
-export type HProps<P extends object = any, DP extends Partial<P> = {}> = {
-    [K in keyof P]-?: K extends 'children' ? (
+export type HProps<P extends object = any> = {
+    [K in keyof P]: K extends 'children' ? (
         P extends { children: any } ? (
             ArrayWrapped<P['children']>
         ) : (
@@ -21,33 +21,29 @@ export type HProps<P extends object = any, DP extends Partial<P> = {}> = {
             )
         )
     ) : (
-        K extends keyof DP ? (
-            Exclude<P[K], undefined>
-        ) : (
-            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;
+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>;
     defaultStore?: Partial<S>;
     storeHandlers?: PartialHandlers<SH, Store<S>>;
     state?: Array<keyof S>;
     context?: Array<keyof C>;
-    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;
+    init?: (this: HNode<P, S, C, SH, CH>, props: HProps<P>, store: Store<S, SH>, context: Store<C, CH>) => void;
+    render: (this: HNode<P, S, C, SH, CH>, props: HProps<P>, store: Store<S, SH>, context: Store<C, CH>) => unknown;
+    clear?: (this: HNode<P, S, C, SH, CH>, props: HProps<P>, store: Store<S, SH>, context: Store<C, CH>) => void;
+    catch?: (this: HNode<P, S, C, SH, CH>, err: any, props: HProps<P>, 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, DP extends Partial<P> = {}> {
+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> {
     isHN: true;
     type: unknown;
-    desc?: HDesc<P, S, C, SH, CH, DP>;
-    props: HProps<P, DP>;
+    desc?: HDesc<P, S, C, SH, CH>;
+    props: HProps<P>;
     sto?: Store<S, SH>;
     ctx?: Store<C, CH>;
     owner?: HNode<any>;
diff --git a/src/core/HUI.ts b/src/core/HUI.ts
index 72d16d4..4252de3 100644
--- a/src/core/HUI.ts
+++ b/src/core/HUI.ts
@@ -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, SH extends HandlerMap<S> = any, CH extends HandlerMap<C> = any, DP extends Partial<P> = {}>(
+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>(
     type: HType<P, S, C, SH, CH> | string, props?: P | null, ...children: unknown[]
-): HNode<P, S, C, SH, CH, DP> => ({
+): HNode<P, S, C, SH, CH> => ({
     isHN: true,
     type,
     desc: registry.get(type),
-    props: _assign({ children: children.flat(_Infinity) }, props) as unknown as HProps<P, DP>,
+    props: _assign({ children: children.flat(_Infinity) }, props) as unknown as HProps<P>,
     active: true
 });
 
diff --git a/src/core/registry.ts b/src/core/registry.ts
index f225d6b..49aec67 100644
--- a/src/core/registry.ts
+++ b/src/core/registry.ts
@@ -6,16 +6,15 @@ 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, any, any, any, any> | string, HDesc<any, any, any, any, any, any>>();
+export const registry = new _Map<HType<any> | string, HDesc<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,
-    DP extends Partial<P> = {}
->(name: string, desc: HDesc<P, S, C, SH, CH, DP>): HType<P, S, C, SH, CH> {
+    CH extends HandlerMap<C> = any
+>(name: string, desc: HDesc<P, S, C, SH, CH>): 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 b8bf185..d417ac5 100644
--- a/test/src/Timer.tsx
+++ b/test/src/Timer.tsx
@@ -11,11 +11,7 @@ type TimerStoreHandlers = {
     setInterval: (interval: number) => any;
 }
 
-interface TimerDefaultProps {
-    start: number;
-}
-
-const Timer = HUI.define<TimerProps, TimerStore, {}, TimerStoreHandlers, {}, TimerDefaultProps>('Timer', {
+const Timer = HUI.define<TimerProps, TimerStore, {}, TimerStoreHandlers, {}>('Timer', {
 
     state: ['time'],
 
@@ -32,7 +28,7 @@ const Timer = HUI.define<TimerProps, TimerStore, {}, TimerStoreHandlers, {}, Tim
     },
 
     init(props, store) {
-        store.set('time', props.start);
+        store.set('time', props.start!);
         store.set('timer', store.trigger('setInterval', 1000));
     },