@tarojs/plugin-platform-harmony-ets 3.7.0-alpha.27 → 4.0.0-alpha.0

package/dist/runtime-ets/dom/stylesheet/index.ts

@@ -1,7 +1,5 @@
 /* eslint-disable accessor-pairs */
 // @ts-nocheck
-import matrix4 from '@ohos.matrix4'
-
 import { ObjectAssign, TaroAny } from '../../'
 import { FlexManager, getNodeMarginOrPaddingData, getUnit } from './util'
 
@@ -143,6 +141,32 @@ export default class StyleSheet {
     this.hmStyle.left = value
   }
 
+  get flex () {
+    return this.hmStyle.flex
+  }
+
+  set flex (value: string | number) {
+    let res: [number, number, number | string] = [0, 0, 'auto']
+
+    if (typeof value === 'number') {
+      res = [value, 1, 0]
+    } else if (value === 'auto') {
+      res = [1, 1, 'auto']
+    } else if (value === 'none') {
+      res = [0, 0, 'auto']
+    } else if (typeof value === 'string') {
+      const FlexList = value.replace(new RegExp('/\\s+/g'), ' ').split(' ')
+      FlexList.forEach((item, index) => {
+        res[index] = index < 2 ? Number(item) : item
+      })
+    }
+
+    this.flexGrow = res[0]
+    this.flexShrink = res[1]
+    this.flexBasis = res[2]
+    this.hmStyle.flex = value
+  }
+
   get flexBasis () {
     return this.hmStyle.flexBasis
   }
@@ -201,6 +225,12 @@ export default class StyleSheet {
     if (typeof value.alignItems !== 'undefined') {
       this.hmStyle.alignItems = value.alignItems
     }
+    if (typeof value.wrap !== 'undefined') {
+      this.hmStyle.flexWrap = value.wrap
+    }
+    if (typeof value.alignContent !== 'undefined') {
+      this.hmStyle.alignContent = value.alignContent
+    }
   }
 
   get flexDirection () {
@@ -211,10 +241,6 @@ export default class StyleSheet {
     this.hmStyle.direction = FlexManager.direction(value)
   }
 
-  set _direction (value: FlexDirection) {
-    this.hmStyle.direction = value
-  }
-
   get justifyContent () {
     return FlexManager.reverseFlexAlign(this.hmStyle.justifyContent)
   }
@@ -223,10 +249,6 @@ export default class StyleSheet {
     this.hmStyle.justifyContent = FlexManager.flexAlign(value)
   }
 
-  set _justifyContent (value: FlexAlign) {
-    this.hmStyle.justifyContent = value
-  }
-
   get alignItems () {
     return FlexManager.reverseItemAlign(this.hmStyle.alignItems)
   }
@@ -235,8 +257,20 @@ export default class StyleSheet {
     this.hmStyle.alignItems = FlexManager.itemAlign(value)
   }
 
-  set _alignItems (value: ItemAlign) {
-    this.hmStyle.alignItems = value
+  get alignContent () {
+    return FlexManager.reverseFlexAlign(this.hmStyle.alignContent)
+  }
+
+  set alignContent (value: string) {
+    this.hmStyle.alignContent = FlexManager.flexAlign(value)
+  }
+
+  get flexWrap () {
+    return FlexManager.reverseFlexWrap(this.hmStyle.wrap)
+  }
+
+  set flexWrap (value: string) {
+    this.hmStyle.wrap = FlexManager.flexWrap(value)
   }
 
   get width () {
@@ -318,6 +352,9 @@ export default class StyleSheet {
     }
     this.hmStyle.backgroundImageSize = value?.size?.[0]
     this.hmStyle.backgroundColor = this.hmStyle.backgroundImage ? null : value?.color
+
+    const _backgroundPosition: HarmonyType.Background.backgroundImagePosition = value?.position?.[0]
+    this.hmStyle.backgroundImagePosition = _backgroundPosition
   }
 
   get backgroundColor () {
@@ -381,6 +418,62 @@ export default class StyleSheet {
     }
   }
 
+  get backgroundPosition () {
+    if (this.hmStyle.backgroundImagePosition) {
+      switch (this.hmStyle.backgroundImagePosition) {
+        case Alignment.TopStart: return 'left top'; break
+        case Alignment.Top: return 'center top'; break
+        case Alignment.TopEnd: return 'right top'; break
+        case Alignment.Start: return 'left center'; break
+        case Alignment.Center: return 'center center'; break
+        case Alignment.End: return 'right center'; break
+        case Alignment.BottomStart: return 'left bottom'; break
+        case Alignment.Bottom: return 'center bottom'; break
+        case Alignment.BottomEnd: return 'right bottom'; break
+        default: {
+          if (this.hmStyle.backgroundImagePosition) {
+            return [this.hmStyle.backgroundImagePosition, this.hmStyle.backgroundImagePosition.y].join(' ')
+          }
+        }
+      }
+    }
+  }
+
+  set backgroundPosition (value: string) {
+    if (typeof value === 'string') {
+      const positions = backgroundImagePosition.split(' ')
+      const horizontal = positions[0].toLowerCase()
+      const vertical = positions[1].toLowerCase() || 'top'
+
+      if (horizontal === 'left' && vertical === 'top') {
+        this.hmStyle.backgroundImagePosition = Alignment.TopStart
+      } else if (horizontal === 'center' && vertical === 'top') {
+        this.hmStyle.backgroundImagePosition = Alignment.Top
+      } else if (horizontal === 'right' && vertical === 'top') {
+        this.hmStyle.backgroundImagePosition = Alignment.TopEnd
+      } else if (horizontal === 'left' && vertical === 'center') {
+        this.hmStyle.backgroundImagePosition = Alignment.Start
+      } else if (horizontal === 'center' && vertical === 'center') {
+        this.hmStyle.backgroundImagePosition = Alignment.Center
+      } else if (horizontal === 'right' && vertical === 'center') {
+        this.hmStyle.backgroundImagePosition = Alignment.End
+      } else if (horizontal === 'left' && vertical === 'bottom') {
+        this.hmStyle.backgroundImagePosition = Alignment.BottomStart
+      } else if (horizontal === 'center' && vertical === 'bottom') {
+        this.hmStyle.backgroundImagePosition = Alignment.Bottom
+      } else if (horizontal === 'right' && vertical === 'bottom') {
+        this.hmStyle.backgroundImagePosition = Alignment.BottomEnd
+      } else {
+        if (/^\d+(\.\d+)?(px|%|vw|vh)$/.test(horizontal)) {
+          this.hmStyle.backgroundImagePosition = { x: getUnit(horizontal) }
+          if (/^\d+(\.\d+)?(px|%|vw|vh)$/.test(vertical)) {
+            this.hmStyle.backgroundImagePosition = { x: getUnit(horizontal), y: getUnit(vertical) }
+          }
+        }
+      }
+    }
+  }
+
   get border () {
     return [this.borderWidth, this.borderStyle, this.bordercolor].join(' ')
   }
@@ -453,7 +546,9 @@ export default class StyleSheet {
   }
 
   set opacity (value: string) {
-    this.hmStyle.opacity = Number(value)
+    const val = Number(value)
+
+    this.hmStyle.opacity = Number.isNaN(val) ? 1 : val
   }
 
   get overflow () {
@@ -464,10 +559,6 @@ export default class StyleSheet {
     this.hmStyle.clip = value === 'hidden'
   }
 
-  set _overflow (value: boolean) {
-    this.hmStyle.clip = value
-  }
-
   get focus () {
     return !!this.hmStyle.focus
   }
@@ -517,6 +608,27 @@ export default class StyleSheet {
     this.hmStyle.fontWeight = value
   }
 
+  get fontStyle () {
+    switch (this.hmStyle.fontStyle) {
+      case FontStyle.Italic: return 'italic'; break
+      case FontStyle.Normal: return 'normal'; break
+      default: return ''
+    }
+  }
+
+  set fontStyle (value: string) {
+    switch (value) {
+      case 'italic':
+        return FontStyle.Italic
+      default:
+        return FontStyle.Normal
+    }
+  }
+
+  set _fontStyle (value: FontStyle) {
+    this.hmStyle.fontStyle = value
+  }
+
   get fontFamily () {
     return this.hmStyle.fontFamily
   }
@@ -598,7 +710,7 @@ export default class StyleSheet {
     }
   }
 
-  set _textDecoration (value: TextDecorationType) {
+  set _decoration (value: TextDecorationType) {
     this.hmStyle.decoration = value
   }
 
@@ -628,6 +740,12 @@ export default class StyleSheet {
   }
 
   set _textOverflow (value: TextOverflow) {
+    switch (value.overflow) {
+      case TextOverflow.Clip: 
+      case TextOverflow.Ellipsis:
+      case TextOverflow.None: this.hmStyle.maxLines = this.hmStyle.maxLines || 1; break
+      default: break
+    }
     this.hmStyle.textOverflow = value
   }
 
@@ -643,11 +761,6 @@ export default class StyleSheet {
     this.hmStyle.maxLines = value
   }
 
-  // TODO: 未实现转换为w3c
-  get linearGradient (): HarmonyType.LinearGradient {
-    return this.hmStyle.linearGradient
-  }
-
   set _linearGradient (value: HarmonyType.LinearGradient[]) {
     this.hmStyle.linearGradient = value?.[0]
   }

package/dist/runtime-ets/dom/stylesheet/type.ts

@@ -10,8 +10,8 @@ export interface HarmonyStyle extends TaroStyleType {
 export interface TaroStyleType {
   id?: string
 
-  padding?: Margin | Length
-  margin?: Margin | Length
+  padding?: Padding
+  margin?: Margin
   width?: Length
   height?: Length
   constraintSize?: ConstraintSizeOptions
@@ -31,7 +31,7 @@ export interface TaroStyleType {
   direction?: FlexDirection
   justifyContent?: FlexAlign
   alignItems?: ItemAlign
-  wrap?: FlexWrap
+  flexWrap?: FlexWrap
   alignContent?: FlexAlign
 
   // background
@@ -39,6 +39,7 @@ export interface TaroStyleType {
   backgroundImage?: ResourceStr
   backgroundRepeat?: ImageRepeat
   backgroundImageSize?: SizeOptions | ImageSize
+  backgroundImagePosition?: Position | Alignment
 
   // transform
   rotate?: HarmonyType.Transform.Rotate

package/dist/runtime-ets/dom/stylesheet/util.ts

@@ -22,6 +22,25 @@ export class FlexManager {
     }
   }
 
+  static reverseFlexAlign (value: FlexAlign): string {
+    switch (value) {
+      case FlexAlign.Start:
+        return 'flex-start'
+      case FlexAlign.End:
+        return 'flex-end'
+      case FlexAlign.Center:
+        return 'center'
+      case FlexAlign.SpaceBetween:
+        return 'space-between'
+      case FlexAlign.SpaceAround:
+        return 'space-around'
+      case FlexAlign.SpaceEvenly:
+        return 'space-evenly'
+      default:
+        return ''
+    }
+  }
+
   static direction (value: string): FlexDirection {
     switch (value) {
       case 'row': return FlexDirection.Row
@@ -31,6 +50,16 @@ export class FlexManager {
     }
   }
 
+  static reverseDirection (value: FlexDirection): string {
+    switch (value) {
+      case FlexDirection.Row: return 'row'
+      case FlexDirection.RowReverse: return 'row-reverse'
+      case FlexDirection.Column: return 'column'
+      case FlexDirection.ColumnReverse: return 'column-reverse'
+      default: return ''
+    }
+  }
+
   static itemAlign (value: string | number | undefined): ItemAlign {
     switch (value) {
       case 'flex-start':
@@ -48,6 +77,25 @@ export class FlexManager {
     }
   }
 
+  static reverseItemAlign (value: ItemAlign): string {
+    switch (value) {
+      case ItemAlign.Start:
+        return 'flex-start'
+      case ItemAlign.End:
+        return 'flex-end'
+      case ItemAlign.Center:
+        return 'center'
+      case ItemAlign.Stretch:
+        return 'stretch'
+      case ItemAlign.Baseline:
+        return 'baseline'
+      case ItemAlign.Auto:
+        return 'auto'
+      default:
+        return ''
+    }
+  }
+
   static justifyContent (value: string): FlexAlign {
     return FlexManager.flexAlign(value)
   }
@@ -61,7 +109,29 @@ export class FlexManager {
   }
 
   static flexWrap (value: string): FlexWrap {
-    return value === 'wrap' ? FlexWrap.Wrap : FlexWrap.NoWrap
+    switch (value) {
+      case 'nowrap':
+        return FlexWrap.NoWrap
+      case 'wrap':
+        return FlexWrap.Wrap
+      case 'wrap-reverse':
+        return FlexWrap.WrapReverse
+      default:
+        return FlexWrap.NoWrap
+    }
+  }
+
+  static reverseFlexWrap (value: FlexWrap): string {
+    switch (value) {
+      case FlexWrap.NoWrap:
+        return 'nowrap'
+      case FlexWrap.Wrap:
+        return 'wrap'
+      case FlexWrap.WrapReverse:
+        return 'wrap-reverse'
+      default:
+        return 'nowrap'
+    }
   }
 
   static alignContent (style: Record<string, string | number> = {}): FlexAlign | undefined {

package/dist/runtime-ets/index.ts

@@ -9,7 +9,6 @@ export * from './bom/window'
 export * from './dom/element'
 export * from './dom/event'
 export * from './dom/node'
-export * from './dom/text'
 export * from './dom/stylesheet'
 export * from './interface'
 export * from './utils'

package/dist/runtime-ets/utils/bind.ts

@@ -1,25 +1,14 @@
 import { bindAttributesCallback } from './info'
 
-import type { TaroElement } from '../dom/element'
+import type { TaroElement } from '../dom/element/element'
 
 // function convertToCamelCase(str) {
 //   return str.replace(/-(.)/g, (_, char) => char.toUpperCase()).replace(/^\w/, firstChar => firstChar.toUpperCase())
 // }
 
-export function bindInstanceToNode (node: TaroElement, instance: any) {
-  if (!node) return
-
-  // @ts-ignore
-  node._instance = instance
-
-  // 触发appear，让node监听到TaroNode已经和ete自定义组件绑定上
-  // @ts-ignore
-  node.resolveAppear?.() // #text node节点没有实现该方法
-}
-
-export function bindScrollTo (node: TaroElement, instance: any) {
+export function bindScrollTo (node: TaroElement) {
   bindAttributesCallback(node, 'scrollTo', () => {
-    instance.scroller.scrollTo({
+    node.scroller.scrollTo({
       xOffset: node._attrs.scrollLeft || 0,
       yOffset: node._attrs.scrollTop || 0,
     })

package/dist/runtime-ets/utils/index.ts

@@ -1,11 +1,14 @@
+import _display from '@ohos.display'
 import { pxTransformHelper } from '@tarojs/taro'
 
 import { NodeType } from '../dom/node'
 
 import type { CSSProperties } from 'react'
-import type { TaroElement } from '../dom/element'
+import type { TaroElement } from '../dom/element/element'
 import type { TaroNode } from '../dom/node'
 
+const display = _display.getDefaultDisplaySync()
+
 export function isElement (node: TaroNode): node is TaroElement {
   return node.nodeType === NodeType.ELEMENT_NODE
 }
@@ -18,7 +21,6 @@ export function isElement (node: TaroNode): node is TaroElement {
 export function isParentBinded (node: TaroElement | null, type: string): boolean {
   let res = false
 
-  // TODO: 当前 node 结构没有 root，因此不作判断，后续可根据情况添加 root 条件
   while (node?.parentElement) {
     if (node.parentElement.__listeners[type]?.length) {
       res = true
@@ -35,7 +37,10 @@ export function convertNumber2PX (value: number) {
   return pxTransformHelper(value, 'vp')
 }
 
-export function convertNumber2VP (value: number) {
+export function convertNumber2VP (value: number, unit = 'px') {
+  if (unit === 'vw' || unit === 'vh') {
+    return (value / 100 * (unit === 'vw' ? display.width: display.height)) + 'px'
+  }
   return pxTransformHelper(value, 'vp')
 }
 
@@ -84,10 +89,10 @@ export function bindFn (fn: any, ctx: any, ...args: any) {
 
 // 使用深度优先遍历寻找节点树中对应的子节点，且只需要找到第一个
 // 通过 selector 判断是 id 还是 selector，从 node 的 id 和 className 属性中寻找
-export function findChildNodeWithDFS<T extends TaroElement> (node: TaroElement, selector: string | ((ele: T) => boolean), selectAll: true): TaroElement[] | null;
-export function findChildNodeWithDFS<T extends TaroElement> (node: TaroElement, selector: string | ((ele: T) => boolean), selectAll?: false): TaroElement | null;
-export function findChildNodeWithDFS<T extends TaroElement> (node: TaroElement, selector: string | ((ele: T) => boolean), selectAll: boolean): TaroElement[] | TaroElement | null;
-export function findChildNodeWithDFS<T extends TaroElement> (node: TaroElement, selector: string | ((ele: T) => boolean), selectAll): TaroElement[] | TaroElement | null {
+export function findChildNodeWithDFS<T extends TaroElement = TaroElement> (node: TaroElement, selector: string | ((ele: T) => boolean), selectAll: true): T[] | null;
+export function findChildNodeWithDFS<T extends TaroElement = TaroElement> (node: TaroElement, selector: string | ((ele: T) => boolean), selectAll?: false): T | null;
+export function findChildNodeWithDFS<T extends TaroElement = TaroElement> (node: TaroElement, selector: string | ((ele: T) => boolean), selectAll: boolean): T[] | T | null;
+export function findChildNodeWithDFS<T extends TaroElement = TaroElement> (node: TaroElement, selector: string | ((ele: T) => boolean), selectAll): T[] | T | null {
   const queue = [node]
 
   const nodeList: TaroElement[] = []

package/dist/runtime-ets/utils/info.ts

@@ -1,6 +1,6 @@
 import { isFunction } from '@tarojs/shared'
 
-import type { TaroElement } from '../dom/element'
+import type { TaroElement } from '../dom/element/element'
 
 export const AREA_CHANGE_EVENT_NAME = 'areaChange'
 export const VISIBLE_CHANGE_EVENT_NAME = 'visibleChange'
@@ -20,34 +20,23 @@ export function createEventTapName (eventName: string) {
 export const disconnectEvent = (node: TaroElement, eventName: string) => {
   if (!node) return null
 
-  const id = node._nid
-  const component = node._instance
-
   try {
-    component.nodeInfoMap[id].eventMap[createEventTapName(eventName)] = false
+    node._nodeInfo.eventMap[createEventTapName(eventName)] = false
   } catch (e) {
     console.warn(`disconnectEvent ${eventName} error: `, e)
   }
 }
 
-export function getComponentEventCallback (node: TaroElement, eventName: string, callback?: (data: {component: any, eventResult: any}) => void) {
-  if (!node || !node?._instance) return null
-
-  const id = node._nid
-  const component = node?._instance
+export function getComponentEventCallback (node: TaroElement, eventName: string, callback?: (data: any) => void) {
+  if (!node) return null
 
-  if (component?.nodeInfoMap?.[id]?.eventMap?.[createEventTapName(eventName)]) {
+  if (node._nodeInfo?.eventMap?.[createEventTapName(eventName)]) {
     return (...eventResult: any[]) => {
-      if (!component?.nodeInfoMap?.[id]?.eventMap?.[createEventTapName(eventName)]) return
+      if (!node._nodeInfo?.eventMap?.[createEventTapName(eventName)]) return
 
-      const res = {
-        component,
-        eventResult
-      }
+      callback && callback(eventResult)
 
-      callback && callback.call(component, res)
-
-      node?.[createEventOnName(eventName)]?.(res)
+      node?.[createEventOnName(eventName)]?.(eventResult)
     }
   }
 
@@ -56,33 +45,25 @@ export function getComponentEventCallback (node: TaroElement, eventName: string,
 
 // eslint-disable-next-line @typescript-eslint/ban-types
 function tapCallbackToNodeAndUpdate (node: TaroElement, eventName: string, callback: Function) {
-  const id = node._nid
-
-  node._instance.nodeInfoMap[id].eventMap[createEventTapName(eventName)] = true
-  node[createEventOnName(eventName)] = ({ eventResult }) => {
+  node._nodeInfo.eventMap[createEventTapName(eventName)] = true
+  node[createEventOnName(eventName)] = (eventResult) => {
     callback && callback(...eventResult)
   }
 
-  // 是半编译模式的节点但没有自主更新权，需要父节点触发更新
-  if (!node._isDynamicNode && node._isCompileMode) {
-    node.updateComponent()
-  }
+  node.updateComponent()
 }
 
 // eslint-disable-next-line @typescript-eslint/ban-types
 export async function setNodeEventCallbackAndTriggerComponentUpdate (node: TaroElement, eventName: string, callback: Function, isAsync = false) {
-  const id = node._nid
-  const instance = node._instance
-
   if (isAsync) {
     // 阻塞函数执行，等待监听节点绑定上的回调函数
-    if (!instance.nodeInfoMap[id].eventMap[createEventTapName(eventName)]) {
+    if (!node._nodeInfo.eventMap[createEventTapName(eventName)]) {
       let onEventPromiseResolve
       const eventPromise = new Promise(resolve => {
         onEventPromiseResolve = resolve
       })
 
-      instance.nodeInfoMap[id].promiseMap[eventName] = eventPromise
+      node._nodeInfo.promiseMap[eventName] = eventPromise
       tapCallbackToNodeAndUpdate(node, eventName, (...eventResult) => {
         callback && callback(...eventResult)
 
@@ -90,39 +71,30 @@ export async function setNodeEventCallbackAndTriggerComponentUpdate (node: TaroE
       })
     }
 
-    await instance.nodeInfoMap[id].promiseMap[eventName]
+    await node._nodeInfo.promiseMap[eventName]
   } else {
     tapCallbackToNodeAndUpdate(node, eventName, callback)
   }
 }
 
 // eslint-disable-next-line @typescript-eslint/ban-types
-export function bindAttributesCallback (node: TaroElement, attributeName: string, callback: Function) {
+export function bindAttributesCallback (node: TaroElement, _: string, callback: Function) {
   if (!node) return
 
-  const id = node._nid
-  const component = node._instance
-
-  component.nodeInfoMap[id].attributeCallback[attributeName] = callback
+  node._nodeInfo = callback
 }
 
 export function triggerAttributesCallback (node, attributeName) {
   if (!node) return
 
-  const id = node._nid
   const value = node._attrs[attributeName]
-
-  return node.awaitAppear.then(() => {
-    const component = node._instance
-    const cb = component.nodeInfoMap[id].attributeCallback[attributeName]
+  const cb = node._nodeInfo.attributeCallback[attributeName]
     
-    isFunction(cb) && cb(value)
-  })
+  isFunction(cb) && cb(value)
 }
 
-export function initComponentNodeInfo (component: any, node: TaroElement) {
-  component.nodeInfoMap[node._nid] = {}
-  component.nodeInfoMap[node._nid].eventMap = {}
-  component.nodeInfoMap[node._nid].promiseMap = {}
-  component.nodeInfoMap[node._nid].attributeCallback = {}
+export function initComponentNodeInfo (node: TaroElement) {
+  node._nodeInfo.eventMap = {}
+  node._nodeInfo.promiseMap = {}
+  node._nodeInfo.attributeCallback = {}
 }

package/dist/runtime-framework/react/app.ts

@@ -1,7 +1,5 @@
-// eslint-disable-next-line import/no-duplicates
-import { Current, document } from '@tarojs/runtime'
-// eslint-disable-next-line import/no-duplicates
-import { eventCenter } from '@tarojs/runtime/dist/runtime.esm'
+import { Current, document } from '@tarojs/runtime' // eslint-disable-line import/no-duplicates
+import { eventCenter } from '@tarojs/runtime/dist/runtime.esm' // eslint-disable-line import/no-duplicates
 
 import { setReconciler } from './connect'
 import { injectPageInstance } from './page'
@@ -69,7 +67,6 @@ export function connectReactPage (
             ...refs
           }))
 
-        // TODO root
         return h(
           'view',
           { id, className: 'taro_page' },
@@ -212,7 +209,7 @@ export function createReactApp (
 
           app.onCreate?.()
         }
-        
+
         eventCenter.trigger('__taroRouterLaunch', launchParam)
       })
     },

package/dist/runtime-framework/react/page.ts

@@ -1,7 +1,5 @@
-// eslint-disable-next-line import/no-duplicates
-import { Current, document, requestAnimationFrame, window } from '@tarojs/runtime'
-// eslint-disable-next-line import/no-duplicates
-import { CONTEXT_ACTIONS, env, eventCenter } from '@tarojs/runtime/dist/runtime.esm'
+import { Current, document, requestAnimationFrame, window } from '@tarojs/runtime' // eslint-disable-line import/no-duplicates
+import { CONTEXT_ACTIONS, env, eventCenter } from '@tarojs/runtime/dist/runtime.esm' // eslint-disable-line import/no-duplicates
 import { hooks, isArray, isFunction, isUndefined } from '@tarojs/shared'
 
 import { ON_HIDE, ON_LOAD, ON_READY, ON_SHOW, ON_UNLOAD } from './constant'
@@ -9,17 +7,14 @@ import { incrementId } from './utils'
 
 import type { PageConfig } from '@tarojs/taro'
 
-// TODO TYPE
 const instances = new Map<string, any>()
 const pageId = incrementId()
 
-// TODO TYPE
 export function injectPageInstance (inst: any, id: string) {
   hooks.call('mergePageInstance', instances.get(id), inst)
   instances.set(id, inst)
 }
 
-// TODO TYPE
 export function getPageInstance (id: string): any {
   return instances.get(id)
 }
@@ -98,12 +93,10 @@ export function createPageConfig (component: any, pageName?: string, pageConfig?
     SIDE_EFFECT_LIFECYCLES,
   ] = hooks.call('getMiniLifecycleImpl')!.page
 
-  // TODO TYPE
   let pageElement: any = null
   let unmounting = false
   let prepareMountList: (() => void)[] = []
 
-  // TODO TYPE
   function setCurrentRouter (page) {
     const router = page.route || page.__route__ || page.$taroPath