@tarojs/taro-h5 3.4.0-beta.0 → 3.4.0-beta.1

package/src/api/open-api/soter.ts

@@ -0,0 +1,6 @@
+import { temporarilyNotSupport } from '../utils'
+
+// 生物认证
+export const startSoterAuthentication = temporarilyNotSupport('startSoterAuthentication')
+export const checkIsSupportSoterAuthentication = temporarilyNotSupport('checkIsSupportSoterAuthentication')
+export const checkIsSoterEnrolledInDevice = temporarilyNotSupport('checkIsSoterEnrolledInDevice')

package/src/api/open-api/subscribe-message.ts

@@ -0,0 +1,4 @@
+import { temporarilyNotSupport } from '../utils'
+
+// 订阅消息
+export const requestSubscribeMessage = temporarilyNotSupport('requestSubscribeMessage')

package/src/api/open-api/user-info.ts

@@ -0,0 +1,5 @@
+import { temporarilyNotSupport } from '../utils'
+
+// 用户信息
+export const getUserProfile = temporarilyNotSupport('getUserProfile')
+export const getUserInfo = temporarilyNotSupport('getUserInfo')

package/src/api/open-api/werun.ts

@@ -0,0 +1,5 @@
+import { temporarilyNotSupport } from '../utils'
+
+// 微信运动
+export const shareToWeRun = temporarilyNotSupport('shareToWeRun')
+export const getWeRunData = temporarilyNotSupport('getWeRunData')

package/src/api/payment/index.ts

@@ -0,0 +1,5 @@
+import { temporarilyNotSupport } from '../utils'
+
+// 支付
+export const requestPayment = temporarilyNotSupport('requestPayment')
+export const requestOrderPayment = temporarilyNotSupport('requestOrderPayment')

package/src/api/route/index.ts

@@ -0,0 +1,10 @@
+// 路由
+export {
+  switchTab,
+  reLaunch,
+  redirectTo,
+  navigateTo,
+  navigateBack
+} from '@tarojs/router'
+
+// FIXME 方法导出类型未对齐，后续修复

package/src/api/share/index.ts

@@ -0,0 +1,13 @@
+import { temporarilyNotSupport } from '../utils'
+
+// 转发
+export const updateShareMenu = temporarilyNotSupport('updateShareMenu')
+export const showShareMenu = temporarilyNotSupport('showShareMenu')
+export const showShareImageMenu = temporarilyNotSupport('showShareImageMenu')
+export const shareVideoMessage = temporarilyNotSupport('shareVideoMessage')
+export const shareFileMessage = temporarilyNotSupport('shareFileMessage')
+export const onCopyUrl = temporarilyNotSupport('onCopyUrl')
+export const offCopyUrl = temporarilyNotSupport('offCopyUrl')
+export const hideShareMenu = temporarilyNotSupport('hideShareMenu')
+export const getShareInfo = temporarilyNotSupport('getShareInfo')
+export const authPrivateMessage = temporarilyNotSupport('authPrivateMessage')

package/src/api/storage/background-fetch.ts

@@ -0,0 +1,7 @@
+import { temporarilyNotSupport } from '../utils'
+
+// 周期性更新
+export const setBackgroundFetchToken = temporarilyNotSupport('setBackgroundFetchToken')
+export const onBackgroundFetchData = temporarilyNotSupport('onBackgroundFetchData')
+export const getBackgroundFetchToken = temporarilyNotSupport('getBackgroundFetchToken')
+export const getBackgroundFetchData = temporarilyNotSupport('getBackgroundFetchData')

package/src/api/storage/index.ts

@@ -0,0 +1,181 @@
+import Taro from '@tarojs/api'
+import { shouldBeObject, getParameterError, temporarilyNotSupport } from '../utils'
+import { MethodHandler } from '../utils/handler'
+
+function getItem (key) {
+  let item
+  try {
+    item = JSON.parse(localStorage.getItem(key) || '')
+  } catch (e) {}
+
+  // 只返回使用 Taro.setStorage API 存储的数据
+  if (item && typeof item === 'object' && item.hasOwnProperty('data')) {
+    return { result: true, data: item.data }
+  } else {
+    return { result: false }
+  }
+}
+
+// 数据缓存
+export const setStorageSync: typeof Taro.setStorageSync = (key, data = '') => {
+  if (typeof key !== 'string') {
+    console.error(getParameterError({
+      name: 'setStorage',
+      correct: 'String',
+      wrong: key
+    }))
+    return
+  }
+
+  const type = typeof data
+  let obj = {}
+
+  if (type === 'symbol') {
+    obj = { data: '' }
+  } else {
+    obj = { data }
+  }
+  localStorage.setItem(key, JSON.stringify(obj))
+}
+
+export const setStorage: typeof Taro.setStorage = (options) => {
+  // options must be an Object
+  const isObject = shouldBeObject(options)
+  if (!isObject.flag) {
+    const res = { errMsg: `setStorage:fail ${isObject.msg}` }
+    console.error(res.errMsg)
+    return Promise.reject(res)
+  }
+
+  const { key, data, success, fail, complete } = options
+  const handle = new MethodHandler({ name: 'setStorage', success, fail, complete })
+
+  if (typeof key !== 'string') {
+    return handle.fail({
+      errMsg: getParameterError({
+        para: 'key',
+        correct: 'String',
+        wrong: key
+      })
+    })
+  }
+
+  setStorageSync(key, data)
+  return handle.success()
+}
+
+export const revokeBufferURL = temporarilyNotSupport('revokeBufferURL')
+
+export const removeStorageSync: typeof Taro.removeStorageSync = (key: string) => {
+  if (typeof key !== 'string') {
+    console.error(getParameterError({
+      name: 'removeStorage',
+      correct: 'String',
+      wrong: key
+    }))
+    return
+  }
+
+  localStorage.removeItem(key)
+}
+
+export const removeStorage: typeof Taro.removeStorage = (options: Taro.removeStorage.Option) => {
+  // options must be an Object
+  const isObject = shouldBeObject(options)
+  if (!isObject.flag) {
+    const res = { errMsg: `removeStorage:fail ${isObject.msg}` }
+    console.error(res.errMsg)
+    return Promise.reject(res)
+  }
+  const { key, success, fail, complete } = options
+  const handle = new MethodHandler({ name: 'removeStorage', success, fail, complete })
+
+  if (typeof key !== 'string') {
+    return handle.fail({
+      errMsg: getParameterError({
+        para: 'key',
+        correct: 'String',
+        wrong: key
+      })
+    })
+  }
+
+  removeStorageSync(key)
+  return handle.success()
+}
+
+export const getStorageSync: typeof Taro.getStorageSync = (key) => {
+  if (typeof key !== 'string') {
+    console.error(getParameterError({
+      name: 'getStorageSync',
+      correct: 'String',
+      wrong: key
+    }))
+    return
+  }
+
+  const res = getItem(key)
+  if (res.result) return res.data
+
+  return ''
+}
+
+export const getStorageInfoSync: typeof Taro.getStorageInfoSync = () => {
+  const res: Taro.getStorageInfoSync.Option = {
+    keys: Object.keys(localStorage),
+    limitSize: NaN,
+    currentSize: NaN
+  }
+  return res
+}
+
+export const getStorageInfo: typeof Taro.getStorageInfo = ({ success, fail, complete } = {}) => {
+  const handle = new MethodHandler<Taro.getStorageInfo.SuccessCallbackOption>({ name: 'getStorageInfo', success, fail, complete })
+  return handle.success(getStorageInfoSync())
+}
+
+export const getStorage: typeof Taro.getStorage = <T>(options) => {
+  // options must be an Object
+  const isObject = shouldBeObject(options)
+  if (!isObject.flag) {
+    const res = { errMsg: `getStorage:fail ${isObject.msg}` }
+    console.error(res.errMsg)
+    return Promise.reject(res)
+  }
+
+  const { key, success, fail, complete } = options
+  const handle = new MethodHandler<Taro.getStorage.SuccessCallbackResult<T>>({ name: 'getStorage', success, fail, complete })
+
+  if (typeof key !== 'string') {
+    return handle.fail({
+      errMsg: getParameterError({
+        para: 'key',
+        correct: 'String',
+        wrong: key
+      })
+    })
+  }
+
+  const { result, data } = getItem(key)
+  if (result) {
+    return handle.success({ data })
+  } else {
+    return handle.fail({
+      errMsg: 'data not found'
+    })
+  }
+}
+
+export const createBufferURL = temporarilyNotSupport('createBufferURL')
+
+export const clearStorageSync: typeof Taro.clearStorageSync = () => {
+  localStorage.clear()
+}
+
+export const clearStorage: typeof Taro.clearStorage = ({ success, fail, complete } = {}) => {
+  const handle = new MethodHandler({ name: 'clearStorage', success, fail, complete })
+  clearStorageSync()
+  return handle.success()
+}
+
+export * from './background-fetch'

package/src/api/swan/index.ts

@@ -0,0 +1,31 @@
+import { temporarilyNotSupport } from '../utils'
+
+export const setPageInfo = temporarilyNotSupport('setPageInfo')
+
+// 百度小程序 AI 相关
+export const ocrIdCard = temporarilyNotSupport('ocrIdCard')
+export const ocrBankCard = temporarilyNotSupport('ocrBankCard')
+export const ocrDrivingLicense = temporarilyNotSupport('ocrDrivingLicense')
+export const ocrVehicleLicense = temporarilyNotSupport('ocrVehicleLicense')
+export const textReview = temporarilyNotSupport('textReview')
+export const textToAudio = temporarilyNotSupport('textToAudio')
+export const imageAudit = temporarilyNotSupport('imageAudit')
+export const advancedGeneralIdentify = temporarilyNotSupport('advancedGeneralIdentify')
+export const objectDetectIdentify = temporarilyNotSupport('objectDetectIdentify')
+export const carClassify = temporarilyNotSupport('carClassify')
+export const dishClassify = temporarilyNotSupport('dishClassify')
+export const logoClassify = temporarilyNotSupport('logoClassify')
+export const animalClassify = temporarilyNotSupport('animalClassify')
+export const plantClassify = temporarilyNotSupport('plantClassify')
+
+// 用户信息
+export const getSwanId = temporarilyNotSupport('getSwanId')
+
+// 百度收银台支付
+export const requestPolymerPayment = temporarilyNotSupport('requestPolymerPayment')
+
+// 打开小程序
+export const navigateToSmartGameProgram = temporarilyNotSupport('navigateToSmartGameProgram')
+export const navigateToSmartProgram = temporarilyNotSupport('navigateToSmartProgram')
+export const navigateBackSmartProgram = temporarilyNotSupport('navigateBackSmartProgram')
+export const preloadSubPackage = temporarilyNotSupport('preloadSubPackage')

package/src/{taro/index.js → api/taro.ts}

@@ -1,104 +1,89 @@
-import Taro from '@tarojs/api'
-
-import {
-  history,
-  navigateBack,
-  navigateTo,
-  createRouter,
-  reLaunch,
-  redirectTo,
-  getCurrentPages,
-  switchTab
-} from '@tarojs/router'
-import { permanentlyNotSupport } from '../api/utils'
-
-const {
-  Behavior,
-  getEnv,
-  ENV_TYPE,
-  Link,
-  interceptors,
-  getInitPxTransform,
-  Current,
-  getCurrentInstance,
-  options,
-  nextTick,
-  eventCenter,
-  Events,
-  preload
-} = Taro
-
-const taro = {
-  Behavior,
-  getEnv,
-  ENV_TYPE,
-  Link,
-  interceptors,
-  Current,
-  getCurrentInstance,
-  options,
-  nextTick,
-  eventCenter,
-  Events,
-  preload,
-  history,
-  navigateBack,
-  navigateTo,
-  createRouter,
-  reLaunch,
-  redirectTo,
-  getCurrentPages,
-  switchTab
-}
-
-const initPxTransform = getInitPxTransform(taro)
-
-const requirePlugin = permanentlyNotSupport('requirePlugin')
-const getApp = function () {
-  return getCurrentInstance().app
-}
-
-const pxTransform = function (size) {
-  const { designWidth } = taro.config
-  return Math.ceil((((parseInt(size, 10) / 40) * 640) / designWidth) * 10000) / 10000 + 'rem'
-}
-const canIUseWebp = function () {
-  const canvas = document.createElement('canvas')
-  return canvas.toDataURL('image/webp').indexOf('data:image/webp') === 0
-}
-
-taro.requirePlugin = requirePlugin
-taro.getApp = getApp
-taro.pxTransform = pxTransform
-taro.initPxTransform = initPxTransform
-taro.canIUseWebp = canIUseWebp
-
-export default taro
-
-export {
-  Behavior,
-  getEnv,
-  ENV_TYPE,
-  Link,
-  interceptors,
-  initPxTransform,
-  Current,
-  getCurrentInstance,
-  options,
-  nextTick,
-  eventCenter,
-  Events,
-  preload,
-  requirePlugin,
-  getApp,
-  pxTransform,
-  canIUseWebp,
-  history,
-  navigateBack,
-  navigateTo,
-  createRouter,
-  reLaunch,
-  redirectTo,
-  getCurrentPages,
-  switchTab
-}
+import Taro from '@tarojs/api'
+
+import {
+  history,
+  createRouter
+} from '@tarojs/router'
+import { getApp, getCurrentInstance, getCurrentPages, nextTick, navigateBack, navigateTo, reLaunch, redirectTo, switchTab } from '../api'
+import { permanentlyNotSupport } from '../api/utils'
+
+const {
+  Behavior,
+  getEnv,
+  ENV_TYPE,
+  Link,
+  interceptors,
+  getInitPxTransform,
+  Current,
+  options,
+  eventCenter,
+  Events,
+  preload
+} = Taro as any
+
+const taro: typeof Taro = {
+  // @ts-ignore
+  Behavior,
+  getEnv,
+  ENV_TYPE,
+  Link,
+  interceptors,
+  Current,
+  getCurrentInstance,
+  options,
+  nextTick,
+  eventCenter,
+  Events,
+  preload,
+  history,
+  createRouter,
+  navigateBack,
+  navigateTo,
+  reLaunch,
+  redirectTo,
+  getCurrentPages,
+  switchTab
+}
+
+const initPxTransform = getInitPxTransform(taro)
+
+const requirePlugin = permanentlyNotSupport('requirePlugin')
+
+const pxTransform = function (size) {
+  // @ts-ignore
+  const { designWidth } = taro.config
+  return Math.ceil((((parseInt(size, 10) / 40) * 640) / designWidth) * 10000) / 10000 + 'rem'
+}
+
+const canIUseWebp = function () {
+  const canvas = document.createElement('canvas')
+  return canvas.toDataURL('image/webp').indexOf('data:image/webp') === 0
+}
+
+taro.requirePlugin = requirePlugin
+taro.getApp = getApp
+taro.pxTransform = pxTransform
+taro.initPxTransform = initPxTransform
+// @ts-ignore
+taro.canIUseWebp = canIUseWebp
+
+export default taro
+
+export {
+  Behavior,
+  getEnv,
+  ENV_TYPE,
+  Link,
+  interceptors,
+  initPxTransform,
+  Current,
+  options,
+  eventCenter,
+  Events,
+  preload,
+  requirePlugin,
+  pxTransform,
+  canIUseWebp,
+  history,
+  createRouter
+}

package/src/api/{createAnimation/index.js → ui/animation/index.ts}

@@ -1,3 +1,5 @@
+import Taro from '@tarojs/api'
+
 /**
  * H5 下的 styleSheet 操作
  * @author leeenx
@@ -7,14 +9,14 @@ class StyleSheet {
     this.$style = document.createElement('style')
   }
 
-  $style = null
-  sheet = null
+  $style: HTMLStyleElement
+  sheet?: CSSStyleSheet | null
   appendStyleSheet = () => {
-    this.$style.setAttribute('type', 'text/css')
-    this.$style.setAttribute('data-type', 'Taro')
+    this.$style?.setAttribute('type', 'text/css')
+    this.$style?.setAttribute('data-type', 'Taro')
     document.getElementsByTagName('head')[0].appendChild(this.$style)
-    this.sheet = this.$style.sheet
-    if (!('insertRule' in this.sheet)) {
+    this.sheet = this.$style?.sheet
+    if (this.sheet && !('insertRule' in this.sheet)) {
       console.warn('当前浏览器不支持 stylesheet.insertRule 接口')
     }
   }
@@ -25,7 +27,7 @@ class StyleSheet {
       // $style 未插入到 DOM
       this.appendStyleSheet()
     }
-    this.sheet.insertRule(cssText, index)
+    this.sheet?.insertRule(cssText, index)
   }
 }
 
@@ -48,22 +50,32 @@ if ($detect.style['animation-name'] === 'standard') {
   TRANSFORM = 'transform'
 } else if ($detect.style['-webkit-animation-name'] === 'webkit') {
   // webkit 前缀
-  TRANSITION_END = 'webkitTransionEnd'
+  TRANSITION_END = 'webkitTransitionEnd'
   TRANSFORM = '-webkit-transform'
 } else if ($detect.style['-moz-animation-name'] === 'moz') {
-  // webkit 前缀
-  TRANSITION_END = 'mozTransionEnd'
+  // moz 前缀
+  TRANSITION_END = 'mozTransitionEnd'
   TRANSFORM = '-moz-transform'
 } else if ($detect.style['-ms-animation-name'] === 'ms') {
-  // webkit 前缀
-  TRANSITION_END = 'MSTransionEnd'
+  // ms 前缀
+  TRANSITION_END = 'msTransitionEnd'
   TRANSFORM = '-ms-transform'
 }
 
 let animId = 0
 
-// Animation 类
-class Animation {
+interface IAnimationAttr {
+  duration: number
+  delay: number
+  timingFunction: string
+  transformOrigin: string
+}
+
+class Animation implements Taro.Animation {
+  unit: string
+  id: number
+  DEFAULT: IAnimationAttr
+
   constructor (
     {
       duration = 400,
@@ -71,7 +83,7 @@ class Animation {
       timingFunction = 'linear',
       transformOrigin = '50% 50% 0',
       unit = 'px'
-    } = {}
+    }: Taro.createAnimation.Option = {}
   ) {
     // 默认值
     this.setDefault(duration, delay, timingFunction, transformOrigin)
@@ -81,8 +93,8 @@ class Animation {
     // 动画 id
     this.id = ++animId
     // 监听事件
-    document.body.addEventListener(TRANSITION_END, e => {
-      const { target } = e
+    document.body.addEventListener(TRANSITION_END, (e: TransitionEvent) => {
+      const target = e.target as HTMLElement
       if (target.getAttribute(animAttr) === null) {
         animAttr = 'data-animation'
       }
@@ -91,12 +103,13 @@ class Animation {
       if (animData === null) return
       const [animName, animPath] = animData.split('__')
       if (animName === `taro-h5-poly-fill/${this.id}/create-animation`) {
-        const [animIndex, stepIndex = 0] = animPath.split('--')
+        const [animIndex, __stepIndex = 0] = animPath.split('--')
+        const stepIndex = Number(__stepIndex)
         // 动画总的关键帧
         const animStepsCount = this.animationMap[`${animName}__${animIndex}`]
         const animStepsMaxIndex = animStepsCount - 1
         if (stepIndex < animStepsMaxIndex) {
-          // 播放下一个关键帧（因为 nevr 和 react 有差异所以 animation & data-animation 都需要写）
+          // 播放下一个关键帧（因为 nerv 和 react 有差异所以 animation & data-animation 都需要写）
           target.setAttribute(animAttr, `${animName}__${animIndex}--${stepIndex + 1}`)
           if (animAttr === 'animation') {
             // Nerv 环境，animation & data-animation 双重保险
@@ -108,7 +121,7 @@ class Animation {
   }
 
   transformUnit (...args) {
-    const ret = []
+    const ret: string[] = []
     args.forEach(each => {
       ret.push(isNaN(each) ? each : `${each}${this.unit}`)
     })
@@ -121,32 +134,37 @@ class Animation {
   }
 
   // 属性组合
-  rules = []
+  rules: string[] = []
   // transform 对象
   transform = [`${TRANSFORM}:`]
   // 组合动画
-  steps = []
+  steps: string[] = []
   // 动画 map ----- 永久保留
   animationMap = {}
   // animationMap 的长度
   animationMapCount = 0
-  matrix (a, b, c, d, e, f) {
-    this.transform.push(`matrix(${a}, ${b}, ${c}, ${d}, ${e}, ${f})`)
+
+  matrix (a: number, b: number, c: number, d: number, tx: number, ty: number) {
+    this.transform.push(`matrix(${a}, ${b}, ${c}, ${d}, ${tx}, ${ty})`)
     return this
   }
 
-  matrix3d (a1, b1, c1, d1, a2, b2, c2, d2, a3, b3, c3, d3, a4, b4, c4, d4) {
+  matrix3d (a1: number, b1: number, c1: number, d1: number, a2: number, b2: number, c2: number, d2: number, a3: number, b3: number, c3: number, d3: number, a4: number, b4: number, c4: number, d4: number) {
     this.transform.push(`matrix3d(${a1}, ${b1}, ${c1}, ${d1}, ${a2}, ${b2}, ${c2}, ${d2}, ${a3}, ${b3}, ${c3}, ${d3}, ${a4}, ${b4}, ${c4}, ${d4})`)
     return this
   }
 
-  rotate (angle) {
+  rotate (angle: number) {
     this.transform.push(`rotate(${angle}deg)`)
     return this
   }
 
-  rotate3d (x, y, z, angle) {
-    this.transform.push(`rotate3d(${x}, ${y}, ${z}, ${angle}deg)`)
+  rotate3d (x: number, y?: number, z?: number, angle?: number) {
+    if (typeof y !== 'number') {
+      this.transform.push(`rotate3d(${x})`)
+    } else {
+      this.transform.push(`rotate3d(${x}, ${y || 0}, ${z || 0}, ${angle || 0}deg)`)
+    }
     return this
   }
 
@@ -284,7 +302,7 @@ class Animation {
   }
 
   // 关键帧载入
-  step (arg = {}) {
+  step (arg: Partial<IAnimationAttr> = {}) {
     const { DEFAULT } = this
     const {
       duration = DEFAULT.duration,
@@ -306,7 +324,7 @@ class Animation {
     // 清空 rules 和 transform
     this.rules = []
     this.transform = [`${TRANSFORM}:`]
-    return this
+    return this as Taro.Animation
   }
 
   // 创建底层数据
@@ -329,13 +347,11 @@ class Animation {
 
   // 动画数据产出
   export () {
-    return this.createAnimationData()
+    return this.createAnimationData() as unknown as ReturnType<Taro.Animation['export']>
   }
 }
 
 // h5 的 createAnimation
-function createAnimation (...arg) {
-  return new Animation(...arg)
+export const createAnimation: typeof Taro.createAnimation = (option) => {
+  return new Animation(option)
 }
-
-export { createAnimation }

package/src/api/ui/background.ts

@@ -0,0 +1,5 @@
+import { temporarilyNotSupport } from '../utils'
+
+// 背景
+export const setBackgroundTextStyle = temporarilyNotSupport('setBackgroundTextStyle')
+export const setBackgroundColor = temporarilyNotSupport('setBackgroundColor')