@tarojs/plugin-platform-harmony-ets 4.0.3-alpha.3 → 4.0.3-alpha.5

package/dist/runtime-ets/constant.ts

@@ -1,15 +1,22 @@
 import { isNumber } from '@tarojs/shared'
 
-export const TYPE = 'type'
-export const VALUE = 'value'
-export const INPUT = 'input'
-export const CHANGE = 'change'
-export const TARGET = 'target'
-export const CONFIRM = 'confirm'
-export const KEY_CODE = 'keyCode'
-export const TIME_STAMP = 'timeStamp'
-export const CURRENT_TARGET = 'currentTarget'
-export const ID = 'id'
+export {
+  A, APP, BEHAVIORS, BODY,
+  CATCH_VIEW, CATCHMOVE, CHANGE,
+  CLASS, COMMENT, COMPILE_MODE,
+  CONFIRM, CONTAINER, CONTEXT_ACTIONS,
+  CURRENT_TARGET, CUSTOM_WRAPPER,
+  DATASET, DATE, DOCUMENT_ELEMENT_NAME,
+  DOCUMENT_FRAGMENT, EVENT_CALLBACK_RESULT,
+  EXTERNAL_CLASSES, FOCUS, HEAD,
+  HOOKS_APP_ID, HTML, ID, INPUT,
+  KEY_CODE, OBJECT, ON_HIDE, ON_LOAD,
+  ON_READY, ON_SHOW, OPTIONS, PAGE_INIT,
+  PROPERTY_THRESHOLD, PROPS, PURE_VIEW, ROOT_STR,
+  SET_DATA, SET_TIMEOUT, STATIC_VIEW, STYLE,
+  TARGET, TARO_RUNTIME, TIME_STAMP,
+  TOUCHMOVE, TYPE, UID, VALUE, VIEW
+} from '@tarojs/runtime/dist/runtime.esm'
 
 export const ATTRIBUTES_CALLBACK_TRIGGER_MAP = {
   scrollTop: {

package/dist/runtime-ets/current.ts

@@ -3,16 +3,38 @@ export const context: any = {
   value: null
 }
 
-// @ts-nocheck
+export const uiContext: any = {
+  resolver: null,
+  value: null
+}
+
 export const Current: any = {
   app: null,
-  uiContext: null,
+  get uiContext () {
+    return uiContext.value
+  },
+  set uiContext (e) {
+    uiContext.resolver(e)
+  },
   router: {},
   taro: {},
   contextPromise: new Promise(resolve => {
     context.resolver = resolve
 
     return resolve
+  }).then(e => {
+    context.value = e
+
+    return e
+  }),
+  uiContextPromise: new Promise(resolve => {
+    uiContext.resolver = resolve
+
+    return resolve
+  }).then((e) => {
+    uiContext.value = e
+
+    return e
   }),
   createHarmonyElement: null
 }

package/dist/runtime-ets/dom/document.ts

@@ -1,10 +1,10 @@
-import { eventSource } from '@tarojs/runtime/dist/runtime.esm'
 import { isUndefined } from '@tarojs/shared'
 
 import { Current } from '../current'
 import { findChildNodeWithDFS, getPageScrollerOrNode } from '../utils'
 import { TaroComment } from './comment'
 import { TaroElement } from './element/element'
+import { eventSource } from './event-source'
 import { NodeType, TaroNode, TaroTextNode } from './node'
 
 import type { Window } from '../bom/window'

package/dist/runtime-ets/dom/element/canvas.ts

@@ -1,8 +1,9 @@
-import { eventSource, TaroAny, TaroNode } from '@tarojs/runtime'
-
+import { eventSource } from '../event-source'
+import { TaroNode } from '../node'
 import { TaroElement } from './element'
 
 import type { CanvasProps, CanvasTouchEvent } from '@tarojs/components/types'
+import type { TaroAny } from '../../interface'
 
 export class CanvasRenderingContext2DWXAdapter extends CanvasRenderingContext2D {
   // constructor(settings?: RenderingContextSetting) {

package/dist/runtime-ets/dom/element/element.ts

@@ -1,20 +1,22 @@
 // @ts-ignore
 import { getPageById } from '@tarojs/plugin-framework-react/dist/runtime'
-import { eventCenter, eventSource } from '@tarojs/runtime/dist/runtime.esm'
 import { EMPTY_OBJ, toCamelCase } from '@tarojs/shared'
 
 import { ATTRIBUTES_CALLBACK_TRIGGER_MAP, ID } from '../../constant'
 import { Current } from '../../current'
+import { eventCenter } from '../../emitter/emitter'
 import { findChildNodeWithDFS } from '../../utils'
 import { initComponentNodeInfo, triggerAttributesCallback } from '../../utils/info'
 import { bindAnimation } from '../bind'
 import { ClassList } from '../class-list'
-import { type ICSSStyleDeclaration, createCSSStyleDeclaration } from '../cssStyleDeclaration'
+import { createCSSStyleDeclaration } from '../cssStyleDeclaration'
+import { eventSource } from '../event-source'
 import { NodeType, TaroNode } from '../node'
 import StyleSheet, { HarmonyStyle, TaroStyleType } from '../stylesheet'
 
 import type { BaseTouchEvent, ITouchEvent, StandardProps } from '@tarojs/components/types'
-import type { TaroAny } from '../../utils'
+import type { TaroAny } from '../../interface'
+import type { ICSSStyleDeclaration } from '../cssStyleDeclaration'
 
 type NamedNodeMap = { name: string, value: string }[]
 
@@ -91,7 +93,7 @@ export class TaroElement<
   }
 
   public get id(): string {
-    return this.getAttribute('id') || this._nid
+    return this.getAttribute('id') || `${this._nid}`
   }
 
   public set className(value: string) {
@@ -338,7 +340,6 @@ export class TaroElement<
   public setLayer (value: number) {
     if (!this.parentNode) return // 没有父节点，不需要设置层级关系
 
-
     const currentPage = getPageById(this.getAttribute('__fixed'))
     if (currentPage) {
       this._page = currentPage

package/dist/runtime-ets/dom/element/form.ts

@@ -56,6 +56,12 @@ class TaroFormWidgetElement<T extends FormWidgetProps = FormWidgetProps> extends
     }
   }
 
+  public removeAttribute(name: string): void {
+    if (name === 'value') {
+      this.value = ''
+    }
+  }
+
   public get name () {
     return this._attrs.name || ''
   }

package/dist/runtime-ets/dom/event-source.ts

@@ -0,0 +1 @@
+export { eventSource } from '@tarojs/runtime/dist/runtime.esm'

package/dist/runtime-ets/dom/eventTarget.ts

@@ -1,6 +1,6 @@
-import { Events } from '@tarojs/runtime/dist/runtime.esm'
 import { isArray } from '@tarojs/shared'
 
+import { Events } from '../emitter/emitter'
 import { TaroEvent } from './event'
 
 import type { EventHandler } from '../interface'

package/dist/runtime-ets/dom/node.ts

@@ -1,9 +1,8 @@
-import { eventSource } from '@tarojs/runtime/dist/runtime.esm'
-
 import TaroDataSourceElement from './dataSource'
+import { eventSource } from './event-source'
 
 import type { StandardProps } from '@tarojs/components/types'
-import type { TaroAny } from '../utils'
+import type { TaroAny } from '../interface'
 import type { TaroDocument } from './document'
 import type { TaroElement } from './element/element'
 
@@ -99,7 +98,7 @@ export class TaroNode extends TaroDataSourceElement {
 
   // 提供唯一标识，方便与小程序一致，能根据uid获取到对应的节点
   public get uid (): string {
-    return this._nid
+    return `${this._nid}`
   }
 
   public get firstChild (): TaroNode | null {

package/dist/runtime-ets/emitter/emitter.ts

@@ -0,0 +1 @@
+export { eventCenter, Events, EventsType } from '@tarojs/runtime/dist/runtime.esm'

package/dist/runtime-ets/env.ts

@@ -0,0 +1 @@
+export { env } from '@tarojs/runtime/dist/runtime.esm'

package/dist/runtime-ets/index.ts

@@ -1,18 +1,33 @@
+/* eslint-disable simple-import-sort/exports */
 // Current必须放在前面初始化
-// eslint-disable-next-line simple-import-sort/exports
 export * from './current'
+export { hooks } from '@tarojs/shared'
+// bom
 export * from './bom/document'
 export * from './bom/getComputedStyle'
-export { nav as navigator } from './bom/navigator'
-export { caf as cancelAnimationFrame, now, raf as requestAnimationFrame } from './bom/raf'
+export * from './bom/history'
+export * from './bom/location'
+export * from './bom/navigator'
+export * from './bom/raf'
+export * from './bom/URL'
 export * from './bom/window'
+// dom
 export * from './dom/element'
 export * from './dom/event'
+export * from './dom/event-source'
 export * from './dom/node'
 export * from './dom/stylesheet'
 export * from './dom/cssNesting'
-export * from './interface'
+// others
+export * from './env'
+export * from './constant'
+export * from './emitter/emitter'
 export * from './utils'
-export * from './utils/info'
-export { URL, URLSearchParams, eventSource, Events } from '@tarojs/runtime/dist/runtime.esm'
-export { hooks } from '@tarojs/shared'
+// typings
+export * from './interface'
+export {
+  Instance, PageProps,
+  ReactPageComponent, ReactPageInstance, ReactAppInstance,
+  PageLifeCycle, PageInstance,
+  AppInstance,
+} from '@tarojs/runtime/dist/runtime.esm'

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

@@ -1 +1,7 @@
 export * from './event'
+export { PageConfig, TFunc } from '@tarojs/runtime/dist/runtime.esm'
+
+export type TaroAny = any
+export type TaroFunc = (...args: TaroAny[]) => TaroAny
+export type TaroIndent = string | number | boolean | undefined | null
+export type TaroObject = Record<string | number | symbol, TaroAny>

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

@@ -161,9 +161,9 @@ export function findChildNodeWithDFS<T extends TaroElement = TaroElement> (node:
 export function findChildNodeWithDFS<T extends TaroElement = TaroElement> (node: TaroElement, selector: string | ((ele: T) => boolean), selectAll): T[] | T | null {
   const queue = [node]
 
-  const nodeList: TaroElement[] = []
+  const nodeList: T[] = []
   while (queue.length) {
-    const currentNode = queue.shift()
+    const currentNode = queue.shift() as T
     if (currentNode) {
       if (typeof selector === 'string') {
         if (selector.startsWith('#')) {
@@ -200,7 +200,5 @@ export function findChildNodeWithDFS<T extends TaroElement = TaroElement> (node:
   return null
 }
 
-export type TaroAny = any
-export type TaroFunc = (...args: TaroAny[]) => TaroAny
-export type TaroIndent = string | number | boolean | undefined | null
-export type TaroObject = Record<string | number | symbol, TaroAny>
+export * from './info'
+export * from './router'

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

@@ -0,0 +1,9 @@
+export {
+  addLeadingSlash,
+  getCurrentPage,
+  getHomePage,
+  hasBasename,
+  stripBasename,
+  stripSuffix,
+  stripTrailing
+} from '@tarojs/runtime/dist/runtime.esm'

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

@@ -1,5 +1,4 @@
-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 { Current, document, eventCenter } from '@tarojs/runtime'
 
 import { setReconciler } from './connect'
 import { injectPageInstance } from './page'

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

@@ -11,7 +11,7 @@ import type {
   PageLifeCycle,
   PageProps,
   TFunc
-} from '@tarojs/runtime/dist/runtime.esm'
+} from '@tarojs/runtime'
 
 const createTaroHook = (lifecycle: keyof PageLifeCycle | keyof AppInstance) => {
   return (fn: TFunc) => {

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

@@ -1,5 +1,4 @@
-import { Current, document, requestAnimationFrame, TaroElement, window } from '@tarojs/runtime' // eslint-disable-line import/no-duplicates
-import { addLeadingSlash, CONTEXT_ACTIONS, env, eventCenter, TFunc } from '@tarojs/runtime/dist/runtime.esm' // eslint-disable-line import/no-duplicates
+import { addLeadingSlash, CONTEXT_ACTIONS, Current, document, env, eventCenter, requestAnimationFrame, TaroElement, TFunc, window } from '@tarojs/runtime'
 import { ensure, hooks, isUndefined } from '@tarojs/shared'
 
 import { ReactMeta as reactMeta } from './app'

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

@@ -1,5 +1,4 @@
-import { Current, document, requestAnimationFrame, window } from '@tarojs/runtime' // eslint-disable-line import/no-duplicates
-import { addLeadingSlash, CONTEXT_ACTIONS, env, eventCenter } from '@tarojs/runtime/dist/runtime.esm' // eslint-disable-line import/no-duplicates
+import { addLeadingSlash, CONTEXT_ACTIONS, Current, document, env, eventCenter, requestAnimationFrame, window } from '@tarojs/runtime'
 import { hooks, isArray, isFunction, isUndefined } from '@tarojs/shared'
 
 import { ON_HIDE, ON_LOAD, ON_READY, ON_SHOW, ON_UNLOAD } from './constant'

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

@@ -1,6 +1,5 @@
 import { createComponent, h, render } from '@tarojs/plugin-framework-solid/dist/reconciler'
-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 { Current, document, eventCenter } from '@tarojs/runtime'
 import { hooks } from '@tarojs/shared'
 import { batch, createContext, createRoot, createSignal, For } from 'solid-js'
 

package/dist/runtime-framework/solid/hooks.ts

@@ -14,7 +14,7 @@ import type {
   AppInstance,
   PageLifeCycle,
   TFunc
-} from '@tarojs/runtime/dist/runtime.esm'
+} from '@tarojs/runtime'
 
 const createTaroHook = (lifecycle: keyof PageLifeCycle | keyof AppInstance) => {
   return (fn: TFunc) => {

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

@@ -1,5 +1,4 @@
-import { Current, document, requestAnimationFrame, window } from '@tarojs/runtime' // eslint-disable-line import/no-duplicates
-import { addLeadingSlash, CONTEXT_ACTIONS, env, eventCenter } from '@tarojs/runtime/dist/runtime.esm' // eslint-disable-line import/no-duplicates
+import { addLeadingSlash, CONTEXT_ACTIONS, Current, document, env, eventCenter, requestAnimationFrame, window } from '@tarojs/runtime'
 import { hooks, isArray, isFunction, isUndefined } from '@tarojs/shared'
 
 import { ON_HIDE, ON_LOAD, ON_READY, ON_SHOW, ON_UNLOAD } from './constant'

package/dist/runtime-framework/solid/reconciler/props.ts

@@ -1,11 +1,10 @@
 import { convertNumber2PX, FormElement } from '@tarojs/runtime'
-import { capitalize, internalComponents, isFunction, isNumber, isObject, isString, toCamelCase } from '@tarojs/shared'
+import { capitalize, internalComponents, isFunction, isNumber, isObject, isString, PLATFORM_TYPE, toCamelCase } from '@tarojs/shared'
 
 import type { Style, TaroElement } from '@tarojs/runtime'
 
 export type Props = Record<string, unknown>
 
-const isHarmony = process.env.TARO_PLATFORM === 'harmony'
 const IS_NON_DIMENSIONAL = /max|aspect|acit|ex(?:s|g|n|p|$)|rph|grid|ows|mnc|ntw|ine[ch]|zoo|^ord|itera/i
 
 function isEventName (s: string) {
@@ -64,16 +63,16 @@ function setEvent (dom: TaroElement, name: string, value: unknown, oldValue?: un
 
   const compName = capitalize(toCamelCase(dom.tagName.toLowerCase()))
 
-  if (eventName === 'click' && !isHarmony && compName in internalComponents) {
+  if (eventName === 'click' && process.env.TARO_PLATFORM !== PLATFORM_TYPE.HARMONY && compName in internalComponents) {
     eventName = 'tap'
   }
 
   if (isFunction(value)) {
     if (oldValue) {
-      dom.removeEventListener(eventName, oldValue as any, !isHarmony ? false : undefined)
-      dom.addEventListener(eventName, value, !isHarmony ? { isCapture, sideEffect: false } : undefined)
+      dom.removeEventListener(eventName, oldValue as any, process.env.TARO_PLATFORM !== PLATFORM_TYPE.HARMONY ? false : undefined)
+      dom.addEventListener(eventName, value, process.env.TARO_PLATFORM !== PLATFORM_TYPE.HARMONY ? { isCapture, sideEffect: false } : undefined)
     } else {
-      dom.addEventListener(eventName, value, !isHarmony ? isCapture : undefined)
+      dom.addEventListener(eventName, value, process.env.TARO_PLATFORM !== PLATFORM_TYPE.HARMONY ? isCapture : undefined)
     }
   } else {
     dom.removeEventListener(eventName, oldValue as any)
@@ -81,13 +80,13 @@ function setEvent (dom: TaroElement, name: string, value: unknown, oldValue?: un
 }
 
 function setStyle (style: Style, key: string, value: unknown) {
-  if (key[0] === '-' && !isHarmony) {
+  if (key[0] === '-' && process.env.TARO_PLATFORM !== PLATFORM_TYPE.HARMONY) {
     // css variables need not further judgment
     style.setProperty(key, (value as string).toString())
     return
   }
 
-  if (isHarmony && key.startsWith('_')) {
+  if (process.env.TARO_PLATFORM === PLATFORM_TYPE.HARMONY && key.startsWith('_')) {
     // harmony样式已处理
     style[key] = value == null ? '' : value
   } else {
@@ -145,7 +144,7 @@ export function setProperty (dom: TaroElement, name: string, value: unknown, old
       for (const i in oldValue) {
         if (!(value && i in (value as StyleValue))) {
           // 鸿蒙伪类特殊处理
-          if (isHarmony && (i === '::after' || i === '::before')) {
+          if (process.env.TARO_PLATFORM === PLATFORM_TYPE.HARMONY && (i === '::after' || i === '::before')) {
             setPseudo(dom, i, null)
           } else {
             style[i] = ''
@@ -157,7 +156,7 @@ export function setProperty (dom: TaroElement, name: string, value: unknown, old
       for (const i in value) {
         if (!oldValue || !isEqual(value[i], (oldValue as StyleValue)[i])) {
           // 鸿蒙伪类特殊处理
-          if (isHarmony && (i === '::after' || i === '::before')) {
+          if (process.env.TARO_PLATFORM === PLATFORM_TYPE.HARMONY && (i === '::after' || i === '::before')) {
             setPseudo(dom, i, value[i] as unknown as StyleValue)
           } else {
             style[i] = value[i]

package/dist/runtime-utils.d.ts

@@ -1,11 +1,10 @@
+import { TFunc } from "@tarojs/runtime";
 import Taro from "@tarojs/taro/types";
-import Taro$0 from "@tarojs/taro";
 declare namespace apis {
     interface ICallbackResult {
         /** 错误信息 */
         errMsg: string;
     }
-    type TFunc = (...args: any[]) => any;
     type TCallback<T = Partial<ICallbackResult>> = (res: T) => Promise<void> | void;
     interface IMethodParam<T = Partial<ICallbackResult>> {
         name: string;
@@ -380,7 +379,7 @@ declare namespace apis {
     const navigateBackMiniProgram: (option?: {}, ...args: any[]) => Promise<Partial<ICallbackResult> & Record<string, unknown> & ICallbackResult>;
     const exitMiniProgram: (option?: {}, ...args: any[]) => Promise<Partial<ICallbackResult> & Record<string, unknown> & ICallbackResult>;
     const openBusinessView: (option?: {}, ...args: any[]) => Promise<Partial<ICallbackResult> & Record<string, unknown> & ICallbackResult>;
-    const downloadFile: typeof Taro$0.downloadFile;
+    const downloadFile: typeof Taro.downloadFile;
     const stopLocalServiceDiscovery: (option?: {}, ...args: any[]) => Promise<Partial<ICallbackResult> & Record<string, unknown> & ICallbackResult>;
     const startLocalServiceDiscovery: (option?: {}, ...args: any[]) => Promise<Partial<ICallbackResult> & Record<string, unknown> & ICallbackResult>;
     const onLocalServiceResolveFail: (option?: {}, ...args: any[]) => Promise<Partial<ICallbackResult> & Record<string, unknown> & ICallbackResult>;
@@ -397,7 +396,7 @@ declare namespace apis {
     const createUDPSocket: (option?: {}, ...args: any[]) => Promise<Partial<ICallbackResult> & Record<string, unknown> & ICallbackResult>;
     // wx 只支持 HTTP POST 请求，OHOS 支持 POST 和 PUT 请求
     // OHOS 不支持 wx 的 timeout，但是支持 file 文件列表上传，wx 是单文件上传
-    const uploadFile: typeof Taro$0.uploadFile;
+    const uploadFile: typeof Taro.uploadFile;
     const connectSocket: typeof Taro.connectSocket;
     const getAccountInfoSync: (option?: {}, ...args: any[]) => Promise<Partial<ICallbackResult> & Record<string, unknown> & ICallbackResult>;
     const chooseAddress: (option?: {}, ...args: any[]) => Promise<Partial<ICallbackResult> & Record<string, unknown> & ICallbackResult>;
@@ -581,7 +580,7 @@ declare namespace apis {
     }
     const createAnimation: (option: Taro.createAnimation.Option) => Animation;
     const setBackgroundTextStyle: (option?: {}, ...args: any[]) => Promise<Partial<ICallbackResult> & Record<string, unknown> & ICallbackResult>;
-    function setBackgroundColor(options: Taro$0.setBackgroundColor.Option): Promise<unknown>;
+    function setBackgroundColor(options: Taro.setBackgroundColor.Option): Promise<unknown>;
     // 自定义组件
     const nextTick: typeof Taro.nextTick;
     const loadFontFace: (option?: {}, ...args: any[]) => Promise<Partial<ICallbackResult> & Record<string, unknown> & ICallbackResult>;

package/dist/runtime-utils.js

@@ -1,8 +1,7 @@
 import { isFunction, isString, isArray, isObject, isNull, isNumber, isUndefined, queryToJson, PLATFORM_TYPE, singleQuote, internalComponents } from '@tarojs/shared';
 import _display from '@ohos.display';
-import { Current, window, eventSource, hooks, document as document$1, getPageScrollerOrNode, findChildNodeWithDFS, setNodeEventCallbackAndTriggerComponentUpdate, AREA_CHANGE_EVENT_NAME, disconnectEvent, VISIBLE_CHANGE_EVENT_NAME, getCurrentInstance } from '@tarojs/runtime';
+import { eventCenter, Current, window, eventSource, hooks, document as document$1, getPageScrollerOrNode, findChildNodeWithDFS, setNodeEventCallbackAndTriggerComponentUpdate, AREA_CHANGE_EVENT_NAME, disconnectEvent, VISIBLE_CHANGE_EVENT_NAME, Events, History, getCurrentInstance } from '@tarojs/runtime';
 import '@ohos.abilityAccessCtrl';
-import { eventCenter, Events, History } from '@tarojs/runtime/dist/runtime.esm';
 import ConfigurationConstant from '@ohos.app.ability.ConfigurationConstant';
 import deviceInfo from '@ohos.deviceInfo';
 import i18n from '@ohos.i18n';