@mpxjs/api-proxy 2.9.11-test.0 → 2.9.13

package/src/mini/transform.js

@@ -0,0 +1,71 @@
+import { error, getEnvObj, genFromMap, makeMap } from '../common/js'
+import getWxToAliApi from './platform/wxToAli'
+import getWxToQqApi from './platform/wxToQq'
+import getWxToTtApi from './platform/wxToTt'
+
+const fromMap = genFromMap()
+
+function joinName (from = '', to = '') {
+  return `${fromMap[from]}_${to}`
+}
+
+function transformApi (options) {
+  const envObj = getEnvObj()
+  const from = options.from
+  const to = options.to
+  const fromTo = joinName(from, to)
+  const wxToAliApi = getWxToAliApi()
+  const wxToQqApi = getWxToQqApi()
+  const wxToTtApi = getWxToTtApi()
+  const platformMap = {
+    wx_ali: wxToAliApi,
+    wx_qq: wxToQqApi,
+    wx_tt: wxToTtApi
+  }
+  const needProxy = Object.create(null)
+  const excludeMap = makeMap(options.exclude)
+  const platformApi = platformMap[fromTo] || {}
+  Object.keys(envObj).concat(Object.keys(platformApi)).forEach((key) => {
+    if (!excludeMap[key]) {
+      needProxy[key] = envObj[key] || platformApi[key]
+    }
+  })
+  const result = Object.create(null)
+  Object.keys(needProxy).forEach(api => {
+    // 非函数不做转换
+    if (typeof needProxy[api] !== 'function') {
+      result[api] = needProxy[api]
+      return
+    }
+
+    result[api] = (...args) => {
+      let from = options.from
+      const to = options.to
+      if (args.length > 0) {
+        from = args.pop()
+        if (typeof from !== 'string' || !fromMap[from]) {
+          args.push(from)
+          from = options.from
+        }
+      }
+
+      const fromTo = joinName(from, to)
+      if (options.custom[fromTo] && options.custom[fromTo][api]) {
+        return options.custom[fromTo][api].apply(this, args)
+      } else if (
+        platformMap[fromTo] &&
+        platformMap[fromTo][api]
+      ) {
+        return platformMap[fromTo][api].apply(this, args)
+      } else if (envObj[api]) {
+        return envObj[api].apply(this, args)
+      } else {
+        error(`当前环境不存在 ${api} 方法`)
+      }
+    }
+  })
+
+  return result
+}
+
+export default transformApi

package/src/{platform → web}/api/action-sheet/ActionSheet.js

@@ -1,9 +1,9 @@
-import { webHandleSuccess, webHandleFail, createDom, bindTap, getRootElement } from '../../../common/js'
+import { ToPromise, webHandleSuccess, webHandleFail, createDom, bindTap, getRootElement } from '../../../common/js'
 import '../../../common/stylus/ActionSheet.styl'
 
-export default class ActionSheet {
+export default class ActionSheet extends ToPromise {
   constructor () {
-    // super()
+    super()
     this.defaultOpts = {
       itemList: [],
       itemColor: '#000000',
@@ -45,7 +45,7 @@ export default class ActionSheet {
           tapIndex: index
         }
         webHandleSuccess(res, opts.success, opts.complete)
-        // this.toPromiseResolve(res)
+        this.toPromiseResolve(res)
       }))
       list.appendChild(sheet)
     })
@@ -58,7 +58,7 @@ export default class ActionSheet {
       this.hide()
       const err = { errMsg: 'showActionSheet:fail cancel' }
       webHandleFail(err, opts.fail, opts.complete)
-      // !opts.fail && this.toPromiseReject(err)
+      !opts.fail && this.toPromiseReject(err)
     }))
     // make transition next frame
     this.actionSheet.classList.add('show')
@@ -67,7 +67,7 @@ export default class ActionSheet {
       this.box.classList.add('show')
     }, 17)
 
-    // return this.toPromiseInitPromise()
+    return this.toPromiseInitPromise()
   }
 
   hide () {

package/src/web/api/index.js

@@ -0,0 +1,68 @@
+// base64ToArrayBuffer, arrayBufferToBase64
+export * from './base'
+
+// createSelectorQuery
+export * from './create-selector-query'
+
+// showActionSheet
+export * from './action-sheet'
+
+// showToast, hideToast, showLoading, hideLoading
+export * from './toast'
+
+// previewImage
+export * from './preview-image'
+
+// showModal
+export * from './modal'
+
+// setStorage, setStorageSync, getStorage, getStorageSync
+// getStorageInfo, getStorageInfoSync, removeStorage, removeStorageSync
+// clearStorage, clearStorageSync
+export * from './storage'
+
+// getSystemInfo, getSystemInfoSync
+export * from './system'
+
+// getNetworkType, onNetworkStatusChange, offNetworkStatusChange
+export * from './device/network'
+
+// request
+export * from './request'
+
+// redirectTo, navigateTo, navigateBack, reLaunch, switchTab
+export * from './route'
+
+// connectSocket, sendSocketMessage, closeSocket
+// onSocketOpen, onSocketError, onSocketMessage, onSocketClose
+export * from './socket'
+
+// setNavigationBarTitle setNavigationBarColor
+export * from './set-navigation-bar'
+
+// nextTick
+export * from './next-tick'
+
+// onWindowResize offWindowResize
+export * from './window'
+
+// stopPullDownRefresh startPullDownRefresh
+export * from './pull-down'
+
+// createInnerAudioContext
+export * from './audio'
+
+// createVideoContext
+export * from './video'
+
+export * from './page-scroll-to'
+
+export * from './tab-bar'
+
+export * from './app'
+
+// createAnimation
+export * from './animation'
+
+// createIntersectionObserver
+export * from './create-intersection-observer'

package/src/{platform → web}/api/modal/Modal.js

@@ -1,4 +1,4 @@
-import { createDom, getRootElement, webHandleSuccess } from '../../../common/js'
+import { ToPromise, createDom, getRootElement, webHandleSuccess } from '../../../common/js'
 import '../../../common/stylus/Modal.styl'
 // import { forEach } from '@didi/mpx-fetch/src/util'
 // 汉字为两个字符，字母/数字为一个字符
@@ -13,8 +13,9 @@ const _getLength = (t) => {
   }
   return len
 }
-export default class Modal {
+export default class Modal extends ToPromise {
   constructor () {
+    super()
     this.defaultOpts = {
       title: '',
       content: '',
@@ -81,6 +82,7 @@ export default class Modal {
         confirm: false
       }
       webHandleSuccess(result, opts.success, opts.complete)
+      this.toPromiseResolve(result)
     }
     this.confirmBtn.onclick = () => {
       this.hide()
@@ -90,9 +92,12 @@ export default class Modal {
         confirm: true
       }
       webHandleSuccess(result, opts.success, opts.complete)
+      this.toPromiseResolve(result)
     }
 
     this.modal.classList.add('show')
+
+    return this.toPromiseInitPromise()
   }
 
   hide () {

package/src/{platform/api/pull-down/index.web.js → web/api/pull-down/index.js}

@@ -20,13 +20,17 @@ function stopPullDownRefresh (options = {}) {
         }
       }
     }
-    if (err) {
-      const res = { errMsg: `stopPullDownRefresh:fail ${err}` }
-      webHandleFail(res, options.fail, options.complete)
-    } else {
-      const res = { errMsg: 'stopPullDownRefresh:ok' }
-      webHandleSuccess(res, options.success, options.complete)
-    }
+    return new Promise((resolve, reject) => {
+      if (err) {
+        const res = { errMsg: `stopPullDownRefresh:fail ${err}` }
+        webHandleFail(res, options.fail, options.complete)
+        reject(res)
+      } else {
+        const res = { errMsg: 'stopPullDownRefresh:ok' }
+        webHandleSuccess(res, options.success, options.complete)
+        resolve(res)
+      }
+    })
   }
 }
 
@@ -50,13 +54,17 @@ function startPullDownRefresh (options = {}) {
         }
       }
     }
-    if (err) {
-      const res = { errMsg: `startPullDownRefresh:fail ${err}` }
-      webHandleFail(res, options.fail, options.complete)
-    } else {
-      const res = { errMsg: 'startPullDownRefresh:ok' }
-      webHandleSuccess(res, options.success, options.complete)
-    }
+    return new Promise((resolve, reject) => {
+      if (err) {
+        const res = { errMsg: `startPullDownRefresh:fail ${err}` }
+        webHandleFail(res, options.fail, options.complete)
+        reject(res)
+      } else {
+        const res = { errMsg: 'startPullDownRefresh:ok' }
+        webHandleSuccess(res, options.success, options.complete)
+        resolve(res)
+      }
+    })
   }
 }
 

package/src/{platform/api/request/index.web.js → web/api/request/index.js}

@@ -51,11 +51,13 @@ function request (options = { url: '' }) {
       clarifyTimeoutError: false
     }
   }
+
   if (method === 'GET') {
     rOptions.params = rOptions.data || {}
     delete rOptions.data
   }
-  axios(rOptions).then(res => {
+
+  const promise = axios(rOptions).then(res => {
     let data = res.data
     if (dataType === 'json' && typeof data === 'string') {
       try {
@@ -79,7 +81,8 @@ function request (options = { url: '' }) {
     }
   })
 
-  return requestTask
+  promise.__returned = requestTask
+  return promise
 }
 
 export {

package/src/{platform/api/route/index.web.js → web/api/route/index.js}

@@ -15,24 +15,30 @@ function redirectTo (options = {}) {
       webHandleFail(res, options.fail, options.complete)
       return Promise.reject(res)
     }
-    router.__mpxAction = { type: 'redirect' }
+    router.__mpxAction = {
+      type: 'redirect'
+    }
     if (routeCount === 0 && router.currentRoute.query.routeCount) routeCount = router.currentRoute.query.routeCount
-    router.replace(
-      {
-        path: options.url,
-        query: {
-          routeCount: ++routeCount
+    return new Promise((resolve, reject) => {
+      router.replace(
+        {
+          path: options.url,
+          query: {
+            routeCount: ++routeCount
+          }
+        },
+        () => {
+          const res = { errMsg: 'redirectTo:ok' }
+          webHandleSuccess(res, options.success, options.complete)
+          resolve(res)
+        },
+        err => {
+          const res = { errMsg: `redirectTo:fail ${err}` }
+          webHandleFail(res, options.fail, options.complete)
+          reject(res)
         }
-      },
-      () => {
-        const res = { errMsg: 'redirectTo:ok' }
-        webHandleSuccess(res, options.success, options.complete)
-      },
-      err => {
-        const res = { errMsg: `redirectTo:fail ${err}` }
-        webHandleFail(res, options.fail, options.complete)
-      }
-    )
+      )
+    })
   }
 }
 
@@ -57,22 +63,26 @@ function navigateTo (options = {}) {
       eventChannel._addListeners(options.events)
     }
     if (routeCount === 0 && router.currentRoute.query.routeCount) routeCount = router.currentRoute.query.routeCount
-    router.push(
-      {
-        path: options.url,
-        query: {
-          routeCount: ++routeCount
+    return new Promise((resolve, reject) => {
+      router.push(
+        {
+          path: options.url,
+          query: {
+            routeCount: ++routeCount
+          }
+        },
+        () => {
+          const res = { errMsg: 'navigateTo:ok', eventChannel }
+          webHandleSuccess(res, options.success, options.complete)
+          resolve(res)
+        },
+        err => {
+          const res = { errMsg: err }
+          webHandleFail(res, options.fail, options.complete)
+          reject(res)
         }
-      },
-      () => {
-        const res = { errMsg: 'navigateTo:ok', eventChannel }
-        webHandleSuccess(res, options.success, options.complete)
-      },
-      err => {
-        const res = { errMsg: err }
-        webHandleFail(res, options.fail, options.complete)
-      }
-    )
+      )
+    })
   }
 }
 
@@ -95,6 +105,7 @@ function navigateBack (options = {}) {
     router.go(-delta)
     const res = { errMsg: 'navigateBack:ok' }
     webHandleSuccess(res, options.success, options.complete)
+    return Promise.resolve(res)
   }
 }
 
@@ -118,25 +129,30 @@ function reLaunch (options = {}) {
       router.go(-delta)
     } else {
       router.__mpxAction.replaced = true
-      router.replace(
-        {
-          path: options.url,
-          query: {
-            routeCount
+      return new Promise((resolve, reject) => {
+        router.replace(
+          {
+            path: options.url,
+            query: {
+              routeCount
+            }
+          },
+          () => {
+            const res = { errMsg: 'reLaunch:ok' }
+            webHandleSuccess(res, options.success, options.complete)
+            resolve(res)
+          },
+          err => {
+            const res = { errMsg: err }
+            webHandleFail(res, options.fail, options.complete)
+            !options.fail && reject(res)
           }
-        },
-        () => {
-          const res = { errMsg: 'reLaunch:ok' }
-          webHandleSuccess(res, options.success, options.complete)
-        },
-        err => {
-          const res = { errMsg: err }
-          webHandleFail(res, options.fail, options.complete)
-        }
-      )
+        )
+      })
     }
     const res = { errMsg: 'reLaunch:ok' }
     webHandleSuccess(res, options.success, options.complete)
+    return Promise.resolve(res)
   }
 }
 
@@ -165,23 +181,28 @@ function switchTab (options = {}) {
         router.go(-delta)
       } else {
         router.__mpxAction.replaced = true
-        router.replace(
-          {
-            path: options.url
-          },
-          () => {
-            const res = { errMsg: 'switchTab:ok' }
-            webHandleSuccess(res, options.success, options.complete)
-          },
-          err => {
-            const res = { errMsg: err }
-            webHandleFail(res, options.fail, options.complete)
-          }
-        )
+        return new Promise((resolve, reject) => {
+          router.replace(
+            {
+              path: options.url
+            },
+            () => {
+              const res = { errMsg: 'switchTab:ok' }
+              webHandleSuccess(res, options.success, options.complete)
+              resolve(res)
+            },
+            err => {
+              const res = { errMsg: err }
+              webHandleFail(res, options.fail, options.complete)
+              !options.fail && reject(res)
+            }
+          )
+        })
       }
     }
     const res = { errMsg: 'switchTab:ok' }
     webHandleSuccess(res, options.success, options.complete)
+    return Promise.resolve(res)
   }
 }
 

package/src/{platform/api/set-navigation-bar/index.web.js → web/api/set-navigation-bar/index.js}

@@ -6,6 +6,7 @@ function setNavigationBarTitle (options = {}) {
     return
   }
   const { title, success, complete } = options
+
   if (document.title !== title) {
     document.title = title
   }

package/src/{platform → web}/api/socket/SocketTask.js

@@ -56,7 +56,7 @@ class SocketTask {
     }
   }
 
-  close (options = {}) {
+  close (options) {
     const { code = 1000, reason = '', success, fail, complete } = options
     this._closeData = {
       code,

package/src/{platform/api/storage/index.web.js → web/api/storage/index.js}

@@ -12,9 +12,11 @@ function setStorage (options = {}) {
 
     const res = { errMsg: 'setStorage:ok' }
     webHandleSuccess(res, success, complete)
+    return Promise.resolve(res)
   } catch (err) {
     const res = { errMsg: `setStorage:fail ${err}` }
     webHandleFail(res, fail, complete)
+    return Promise.reject(res)
   }
 }
 
@@ -44,9 +46,11 @@ function getStorage (options = {}) {
   if (result) {
     const res = { errMsg: 'getStorage:ok', data: data }
     webHandleSuccess(res, success, complete)
+    return Promise.resolve(res)
   } else {
     const res = { errMsg: 'getStorage:fail', data: null }
     webHandleFail(res, fail, complete)
+    return Promise.reject(res)
   }
 }
 
@@ -87,9 +91,11 @@ function getStorageInfo (options = {}) {
 
     const res = Object.assign({}, { errMsg: 'getStorageInfo:ok' }, info)
     webHandleSuccess(res, success, complete)
+    return Promise.resolve(res)
   } catch (err) {
     const res = { errMsg: `getStorageInfo:fail ${err}` }
     webHandleFail(res, fail, complete)
+    return Promise.reject(res)
   }
 }
 
@@ -117,9 +123,11 @@ function removeStorage (options = { key: '' }) {
 
     const res = { errMsg: 'removeStorage:ok' }
     webHandleSuccess(res, success, complete)
+    return Promise.resolve(res)
   } catch (err) {
     const res = { errMsg: `removeStorage:fail ${err}` }
     webHandleFail(res, fail, complete)
+    return Promise.reject(res)
   }
 }
 
@@ -143,9 +151,11 @@ function clearStorage (options = {}) {
 
     const res = { errMsg: 'clearStorage:ok' }
     webHandleSuccess(res, success, complete)
+    return Promise.resolve(res)
   } catch (err) {
     const res = { errMsg: `clearStorage:fail ${err}` }
     webHandleFail(res, fail, complete)
+    return Promise.reject(res)
   }
 }
 

package/src/{platform/api/system/index.web.js → web/api/system/index.js}

@@ -77,6 +77,7 @@ function getSystemInfo (options = {}) {
   const info = getSystemInfoSync()
   const res = Object.assign({ errMsg: 'getSystemInfo:ok' }, info)
   webHandleSuccess(res, options.success, options.complete)
+  return Promise.resolve(res)
 }
 
 export {

package/src/{platform/api/tab-bar/index.web.js → web/api/tab-bar/index.js}

@@ -21,8 +21,10 @@ function setTabBarStyle (options = {}) {
 
   if (resolved) {
     webHandleSuccess(resolved, options.success, options.complete)
+    return Promise.resolve(resolved)
   }
   webHandleFail(rejected, options.fail, options.complete)
+  return Promise.reject(rejected)
 }
 
 function setTabBarItem (options = {}) {
@@ -50,8 +52,10 @@ function setTabBarItem (options = {}) {
 
   if (resolved) {
     webHandleSuccess(resolved, options.success, options.complete)
+    return Promise.resolve(resolved)
   }
   webHandleFail(rejected, options.fail, options.complete)
+  return Promise.reject(rejected)
 }
 
 function showTabBar (options = {}) {
@@ -66,8 +70,10 @@ function showTabBar (options = {}) {
 
   if (resolved) {
     webHandleSuccess(resolved, options.success, options.complete)
+    return Promise.resolve(resolved)
   }
   webHandleFail(rejected, options.fail, options.complete)
+  return Promise.reject(rejected)
 }
 
 function hideTabBar (options = {}) {
@@ -82,8 +88,10 @@ function hideTabBar (options = {}) {
 
   if (resolved) {
     webHandleSuccess(resolved, options.success, options.complete)
+    return Promise.resolve(resolved)
   }
   webHandleFail(rejected, options.fail, options.complete)
+  return Promise.reject(rejected)
 }
 
 export {

package/src/{platform → web}/api/toast/Toast.js

@@ -76,6 +76,7 @@ export default class Toast {
 
     const errMsg = type === 'loading' ? 'showLoading:ok' : 'showToast:ok'
     webHandleSuccess({ errMsg }, opts.success, opts.complete)
+    return Promise.resolve({ errMsg })
   }
 
   hide (options = {}, type) {
@@ -89,10 +90,11 @@ export default class Toast {
       clearTimeout(this.hideTimer)
       this.hideTimer = null
     }
+
     this.hideTimer = setTimeout(() => {
       this.toast.classList.remove('show')
       this.toast.remove() // hide 则卸载
     }, duration)
-    // return Promise.resolve({ errMsg }) todo 验证一下
+    return Promise.resolve({ errMsg })
   }
 }

package/src/install.js

@@ -1,62 +0,0 @@
-import * as platformApi from './platform'
-import { getEnvObj, getEnvStr } from './common/js'
-import promisify from './common/js/promisify'
-
-export default function install (target, options = {}) {
-  const {
-    usePromise = false, // 是否转为 promise 格式
-    whiteList = [], // 强制变成 promise 格式的 api
-    blackList = [], // 强制不变成 promise 格式的 api
-    custom = {}, // 自定义转化规则
-    fallbackMap = {} // 对于不支持的API，允许配置一个映射表，接管不存在的API
-  } = options
-
-  let transedApi = {}
-  const envStr = getEnvStr()
-
-  if (__mpx_env__ === 'web') {
-    transedApi = platformApi
-  } else {
-    const envObj = getEnvObj()
-    Object.keys(envObj).concat(Object.keys(platformApi)).forEach((key) => {
-      transedApi[key] = platformApi[key] || envObj[key]
-    })
-  }
-
-  const promisedApi = usePromise ? promisify(transedApi, whiteList, blackList) : {}
-  const allApi = Object.assign({}, transedApi, promisedApi)
-
-  Object.keys(allApi).forEach(api => {
-    try {
-      if (typeof allApi[api] !== 'function') {
-        target[api] = allApi[api]
-        return
-      }
-      target[api] = (...args) => {
-        return allApi[api].apply(target, args)
-      }
-    } catch (e) {
-    } // 支付宝不支持重写 call 方法
-  })
-  if (custom[envStr]) {
-    Object.keys(custom[envStr])
-      .forEach(k => {
-        target[k] = (...args) => {
-          return custom[envStr][k].apply(target, args)
-        }
-      })
-  }
-  // Fallback Map option
-  Object.keys(fallbackMap)
-    .forEach(k => {
-      if (!target[k]) {
-        target[k] = fallbackMap[k]
-      }
-    })
-}
-
-export function getProxy (options = {}) {
-  const apiProxy = {}
-  install(apiProxy, options)
-  return apiProxy
-}