unify type styles

Author: wooloo26

src/commit.ts

@@ -1,4 +1,4 @@
-import { FiberFinish, FiberHost, HTMLElementEx, IFiber, Ref, TAG } from './type'
+import { FiberFinish, FiberHost, HTMLElementEx, Fiber, Ref, TAG } from './type'
 import { updateElement } from './dom'
 import { isFn } from './reconcile'
 
@@ -38,14 +38,14 @@ const refer = (ref?: Ref<HTMLElementEx>, dom?: HTMLElementEx) => {
   if (ref) isFn(ref) ? ref(dom) : (ref.current = dom)
 }
 
-const kidsRefer = (kids: IFiber[]) => {
+const kidsRefer = (kids: Fiber[]) => {
   kids.forEach((kid) => {
     kid.kids && kidsRefer(kid.kids)
     refer(kid.ref, null)
   })
 }
 
-export const removeElement = (fiber: IFiber) => {
+export const removeElement = (fiber: Fiber) => {
   if (fiber.isComp) {
     fiber.hooks && fiber.hooks.list.forEach((e) => e[2] && e[2]())
     fiber.kids.forEach(removeElement)

src/h.ts

@@ -1,5 +1,5 @@
 import { isStr, arrayfy } from './reconcile'
-import { FC, FreNode, FreText, IFiber } from './type'
+import { FC, FreNode, FreText, Fiber } from './type'
 
 // for jsx2
 export const h = (type: string | FC, props: any, ...kids: FreNode[]) => {
@@ -20,7 +20,7 @@ export const h = (type: string | FC, props: any, ...kids: FreNode[]) => {
 const some = <T>(x: T | boolean | null | undefined): x is T =>
   x != null && x !== true && x !== false
 
-const flat = (arr: FreNode[], target: IFiber[] = []) => {
+const flat = (arr: FreNode[], target: Fiber[] = []) => {
   arr.forEach((v) => {
     isArr(v)
       ? flat(v, target)
@@ -37,7 +37,7 @@ export const createVnode = (type, props, key, ref) => ({
 })
 
 export const createText = (vnode: FreText) =>
-  ({ type: '#text', props: { nodeValue: vnode + '' } } as IFiber)
+  ({ type: '#text', props: { nodeValue: vnode + '' } } as Fiber)
 
 export function Fragment(props) {
   return props.children

src/hook.ts

@@ -2,7 +2,7 @@ import { update, isFn, getCurrentFiber } from './reconcile'
 import {
   DependencyList,
   Reducer,
-  IFiber,
+  Fiber,
   Dispatch,
   SetStateAction,
   EffectCallback,
@@ -93,13 +93,13 @@ export const useRef = <T>(current: T): RefObject<T> => {
 }
 
 export const getHook = <T extends HookList = HookList>(cursor: number) => {
-  const current: IFiber = getCurrentFiber()
+  const current: Fiber = getCurrentFiber()
   const hooks =
     current.hooks || (current.hooks = { list: [], effect: [], layout: [] })
   if (cursor >= hooks.list.length) {
     hooks.list.push([] as any)
   }
-  return [hooks.list[cursor], current] as unknown as [Partial<T>, IFiber]
+  return [hooks.list[cursor], current] as unknown as [Partial<T>, Fiber]
 }
 
 export type ContextType<T> = {

src/reconcile.ts

@@ -1,35 +1,35 @@
-import { IFiber, FC, HookEffect, FreText, TAG, Action, FiberHost, FiberFinish } from './type'
+import { Fiber, FC, HookEffect, FreText, TAG, Action, FiberHost, FiberFinish } from './type'
 import { createElement } from './dom'
 import { resetCursor } from './hook'
 import { schedule, shouldYield } from './schedule'
 import { isArr, createText } from './h'
 import { commit, removeElement } from './commit'
 
-let currentFiber: IFiber = null
+let currentFiber: Fiber = null
 let rootFiber = null
 
-export const render = (vnode: IFiber, node: Node) => {
+export const render = (vnode: Fiber, node: Node) => {
   rootFiber = {
     node,
     props: { children: vnode },
-  } as IFiber
+  } as Fiber
   update(rootFiber)
 }
 
-export const update = (fiber?: IFiber) => {
+export const update = (fiber?: Fiber) => {
   if (!fiber.dirty) {
     fiber.dirty = true
     schedule(() => reconcile(fiber))
   }
 }
 
-const reconcile = (fiber?: IFiber) => {
+const reconcile = (fiber?: Fiber) => {
   while (fiber && !shouldYield()) fiber = capture(fiber)
   if (fiber) return reconcile.bind(null, fiber) as typeof reconcile
   return null
 }
 
-const memo = (fiber: IFiber) => {
+const memo = (fiber: Fiber) => {
   if ((fiber.type as FC).memo && fiber.old?.props) {
     let scu = (fiber.type as FC).shouldUpdate || shouldUpdate
     if (!scu(fiber.props, fiber.old.props)) {
@@ -40,7 +40,7 @@ const memo = (fiber: IFiber) => {
   return null
 }
 
-const capture = (fiber: IFiber) => {
+const capture = (fiber: Fiber) => {
   fiber.isComp = isFn(fiber.type)
   if (fiber.isComp) {
     const memoFiber = memo(fiber)
@@ -56,7 +56,7 @@ const capture = (fiber: IFiber) => {
   return sibling
 }
 
-const getSibling = (fiber?: IFiber) => {
+const getSibling = (fiber?: Fiber) => {
   while (fiber) {
     bubble(fiber)
     if (fiber.dirty) {
@@ -70,7 +70,7 @@ const getSibling = (fiber?: IFiber) => {
   return null
 }
 
-const bubble = (fiber: IFiber) => {
+const bubble = (fiber: Fiber) => {
   if (fiber.isComp) {
     if (fiber.hooks) {
       side(fiber.hooks.layout)
@@ -87,7 +87,7 @@ const shouldUpdate = (
   for (let i in b) if (a[i] !== b[i]) return true
 }
 
-const updateHook = (fiber: IFiber) => {
+const updateHook = (fiber: Fiber) => {
   resetCursor()
   currentFiber = fiber
   let children = (fiber.type as FC)(fiber.props)
@@ -103,18 +103,18 @@ const updateHost = (fiber: FiberHost) => {
   reconcileChidren(fiber, fiber.props.children)
 }
 
-const simpleVnode = (type: IFiber | FreText) =>
+const simpleVnode = (type: Fiber | FreText) =>
   isStr(type) ? createText(type) : type
 
-const getParentNode = (fiber: IFiber) => {
+const getParentNode = (fiber: Fiber) => {
   while ((fiber = fiber.parent)) {
     if (!fiber.isComp) return fiber.node
   }
 }
 
 const reconcileChidren = (
-  fiber: IFiber,
-  children: IFiber | IFiber[] | null | undefined
+  fiber: Fiber,
+  children: Fiber | Fiber[] | null | undefined
 ) => {
   let aCh = fiber.kids || [],
     bCh = (fiber.kids = arrayfy(children))
@@ -136,7 +136,7 @@ const reconcileChidren = (
   }
 }
 
-function clone(a: IFiber, b: IFiber) {
+function clone(a: Fiber, b: Fiber) {
   b.hooks = a.hooks
   b.ref = a.ref
   b.node = a.node // 临时修复
@@ -153,11 +153,11 @@ const side = (effects?: HookEffect[]) => {
   effects.length = 0
 }
 
-const diff = function (a: IFiber[], b: IFiber[]) {
+const diff = function (a: Fiber[], b: Fiber[]) {
   var actions: Action[] = [],
     aIdx: Record<string, number | undefined> = {},
     bIdx: Record<string, number | undefined> = {},
-    key = (v: IFiber) => v.key + v.type,
+    key = (v: Fiber) => v.key + v.type,
     i: number,
     j: number
   for (i = 0; i < a.length; i++) {

src/schedule.ts

@@ -1,6 +1,6 @@
-import { ITask, ITaskCallback } from './type'
+import { Task, TaskCallback } from './type'
 
-const queue: ITask[] = []
+const queue: Task[] = []
 const threshold: number = 5
 const transitions: (() => void)[] = []
 let deadline: number = 0
@@ -9,7 +9,7 @@ export const startTransition = (cb: () => void) => {
   transitions.push(cb) && translate()
 }
 
-export const schedule = (callback: ITaskCallback) => {
+export const schedule = (callback: TaskCallback) => {
   queue.push({ callback })
   startTransition(flush)
 }
@@ -52,4 +52,4 @@ export const shouldYield = () => {
 
 export const getTime = () => performance.now()
 
-const peek = (queue: ITask[]) => queue[0]
+const peek = (queue: Task[]) => queue[0]

src/type.ts

@@ -16,12 +16,12 @@ export interface IntrinsicAttributes extends Record<string, any> {
 export interface Attributes extends Record<string, any> {
   key?: Key
   ref?: Ref
-  children?: IFiber[]
+  children?: Fiber[]
 }
 
 export interface FC<P extends IntrinsicAttributes = IntrinsicAttributes> {
-  (props: P): IFiber | FreText | null | undefined
-  fiber?: IFiber
+  (props: P): Fiber | FreText | null | undefined
+  fiber?: Fiber
   type?: string
   memo?: boolean
   shouldUpdate?: (newProps: P, oldProps: P) => boolean
@@ -61,7 +61,7 @@ interface FiberBaseFinish extends FiberBase {
   old?: FiberFinish
 }
 
-export type IFiber = FiberHost | FiberComp | FiberBase
+export type Fiber = FiberHost | FiberComp | FiberBase
 
 export interface FiberHost extends FiberBase {
   type?: string
@@ -88,22 +88,22 @@ interface FiberBase {
   isComp?: boolean
   parentNode?: HTMLElementEx | {}
   node?: HTMLElementEx
-  kids?: IFiber[]
+  kids?: Fiber[]
   dirty?: boolean
-  parent?: IFiber
-  sibling?: IFiber
-  child?: IFiber
+  parent?: Fiber
+  sibling?: Fiber
+  child?: Fiber
   ref?: Ref<HTMLElement | undefined>
-  old?: IFiber
+  old?: Fiber
   hooks?: Hooks
   action?: Action | null
   lane?: number
 }
 
 export interface Action {
   op: TAG
-  elm?: IFiber
-  before?: IFiber
+  elm?: Fiber
+  before?: Fiber
 }
 
 export const enum TAG {
@@ -120,15 +120,15 @@ export type HTMLElementEx = HTMLElement | Text | SVGElement
 
 export type FreText = string | number
 export type FreNode = Child[] | Child
-export type Child = IFiber | FreText | null | undefined | boolean
+export type Child = Fiber | FreText | null | undefined | boolean
 export type SetStateAction<S> = S | ((prevState: S) => S)
 export type Dispatch<A> = (value: A) => void
 export type Reducer<S, A> = (prevState: S, action: A) => S
 export type EffectCallback = () => any | (() => () => any)
 export type DependencyList = ReadonlyArray<unknown>
 
-export type ITaskCallback = (() => ITaskCallback) | null | undefined
+export type TaskCallback = (() => TaskCallback) | null | undefined
 
-export interface ITask {
-  callback?: ITaskCallback
+export interface Task {
+  callback?: TaskCallback
 }