@mpxjs/api-proxy 2.7.52 → 2.8.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.7.52",
+  "version": "2.8.0-beta.0",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
@@ -39,5 +39,5 @@
   "dependencies": {
     "axios": "^0.21.1"
   },
-  "gitHead": "187abad504151455e045c0adf2fe7f81412e0fef"
+  "gitHead": "bce2bb22d8990ad02879f45fc95c02ead43ba0e4"
 }

package/src/common/js/ToPromise.js

@@ -3,15 +3,18 @@ class ToPromise {
     this._resolve = null
     this._reject = null
   }
+
   toPromiseInitPromise () {
     return new Promise((resolve, reject) => {
       this._resolve = resolve
       this._reject = reject
     })
   }
+
   toPromiseResolve (res) {
     this._resolve(res)
   }
+
   toPromiseReject (err) {
     this._reject(err)
   }

package/src/common/js/utils.js

@@ -12,12 +12,17 @@
  *  d: 4 // 增加 d
  * })
  */
+const hasOwnProperty = Object.prototype.hasOwnProperty
+
+function hasOwn (obj, key) {
+  return hasOwnProperty.call(obj, key)
+}
 
 function changeOpts (options, updateOrRemoveOpt = {}, extraOpt = {}) {
   let opts = {}
 
   Object.keys(options).forEach(key => {
-    let myKey = updateOrRemoveOpt.hasOwnProperty(key) ? updateOrRemoveOpt[key] : key
+    const myKey = hasOwn(updateOrRemoveOpt, key) ? updateOrRemoveOpt[key] : key
     if (myKey !== '') {
       opts[myKey] = options[key]
     }
@@ -31,6 +36,7 @@ function changeOpts (options, updateOrRemoveOpt = {}, extraOpt = {}) {
 /**
  * @param {Object} opts 原参数
  * @param {Function} getOptions 获取 success 回调修改后的参数
+ * @param {Object} thisObj this对象
  */
 const handleSuccess = (opts, getOptions = noop, thisObj) => {
   if (!opts.success) {
@@ -92,7 +98,7 @@ function makeMap (arr) {
   }, {})
 }
 
-const inBrowser = typeof window !== 'undefined'
+const isBrowser = typeof window !== 'undefined'
 
 export {
   changeOpts,
@@ -103,5 +109,6 @@ export {
   warn,
   noop,
   makeMap,
-  inBrowser
+  isBrowser,
+  hasOwn
 }

package/src/index.js

@@ -71,7 +71,7 @@ export default function install (target, options = {}) {
 }
 
 export function getProxy (options = {}) {
-  let apiProxy = {}
+  const apiProxy = {}
   install(apiProxy, options)
   return apiProxy
 }

package/src/index.web.js

@@ -21,7 +21,7 @@ export default function install (target) {
   })
 }
 export function getProxy () {
-  let apiProxy = {}
+  const apiProxy = {}
   install(apiProxy)
   return apiProxy
 }

package/src/mini/platform/wxToAli.js

@@ -38,7 +38,7 @@ const getWxToAliApi = ({ optimize = false }) => {
         if (systemInfo) return systemInfo
       }
 
-      let res = ALI_OBJ.getSystemInfoSync() || {}
+      const res = ALI_OBJ.getSystemInfoSync() || {}
 
       res.system = `${res.platform} ${res.system}`
       res.SDKVersion = ALI_OBJ.SDKVersion
@@ -54,7 +54,7 @@ const getWxToAliApi = ({ optimize = false }) => {
     },
 
     nextTick (fn) {
-      setTimeout(fn)
+      Promise.resolve().then(fn)
     },
 
     /**
@@ -86,7 +86,7 @@ const getWxToAliApi = ({ optimize = false }) => {
         })
 
         handleSuccess(opts, res => {
-          return changeOpts(res, undefined, { 'cancel': !res.confirm })
+          return changeOpts(res, undefined, { cancel: !res.confirm })
         })
 
         ALI_OBJ.confirm(opts)
@@ -122,7 +122,7 @@ const getWxToAliApi = ({ optimize = false }) => {
       const cacheFail = opts.fail || noop
 
       opts.success = function (res) {
-        let sucRes = changeOpts(res, {
+        const sucRes = changeOpts(res, {
           index: 'tapIndex'
         })
         if (sucRes.tapIndex === -1) {
@@ -235,7 +235,7 @@ const getWxToAliApi = ({ optimize = false }) => {
       const opts = changeOpts(options)
 
       if (opts.current) {
-        let idx = options.urls.indexOf(opts.current)
+        const idx = options.urls.indexOf(opts.current)
         opts.current = idx !== -1 ? idx : 0
       }
 
@@ -328,7 +328,7 @@ const getWxToAliApi = ({ optimize = false }) => {
       handleSuccess(opts, res => {
         if (res.fileList) {
           res.fileList.forEach(file => {
-            let resFile = changeOpts(file, {
+            const resFile = changeOpts(file, {
               apFilePath: 'filePath'
             })
             file = resFile
@@ -490,10 +490,10 @@ const getWxToAliApi = ({ optimize = false }) => {
         warn(`支付宝不支持在 ${TIPS_NAME}.getUserInfo 中使用 lang 参数`)
       }
 
-      let opts = changeOpts(options)
+      const opts = changeOpts(options)
 
       handleSuccess(opts, res => {
-        let userInfo = changeOpts(res, { avatar: 'avatarUrl' }, { gender: 0 })
+        const userInfo = changeOpts(res, { avatar: 'avatarUrl' }, { gender: 0 })
         const params = ['country', 'province', 'city', 'language']
 
         params.forEach(key => {
@@ -518,7 +518,7 @@ const getWxToAliApi = ({ optimize = false }) => {
         error(`请在支付函数 ${TIPS_NAME}.requestPayment 中添加 tradeNO 参数用于支付宝支付`)
       }
 
-      let opts = changeOpts(options, {
+      const opts = changeOpts(options, {
         timeStamp: '',
         nonceStr: '',
         package: '',
@@ -556,7 +556,7 @@ const getWxToAliApi = ({ optimize = false }) => {
      */
 
     createCanvasContext (canvasId = {}) {
-      let ctx = ALI_OBJ.createCanvasContext(canvasId)
+      const ctx = ALI_OBJ.createCanvasContext(canvasId)
 
       CANVAS_MAP[canvasId] = ctx
 
@@ -620,6 +620,7 @@ const getWxToAliApi = ({ optimize = false }) => {
      * WXML
      */
 
+    // todo 支付宝基础库升级至2.7.4以上可去除
     createSelectorQuery (options = {}) {
       const selectorQuery = ALI_OBJ.createSelectorQuery(options)
       const proxyMethods = ['boundingClientRect', 'scrollOffset']
@@ -636,7 +637,7 @@ const getWxToAliApi = ({ optimize = false }) => {
       selectorQuery.exec = function (originalCb = noop) {
         const cb = function (results) {
           results.forEach((item, index) => {
-            cbs[index] && cbs[index](item)
+            cbs[index](item)
           })
           originalCb(results)
         }

package/src/mini/platform/wxToQq.js

@@ -2,7 +2,7 @@ import { changeOpts, getEnvObj } from '../../common/js'
 
 const QQ_OBJ = getEnvObj()
 
-const getWxToQqApi = ({ optimize = false }) => {
+const getWxToQqApi = () => {
   return {
     /**
      * 订阅消息

package/src/mini/platform/wxToTt.js

@@ -0,0 +1,9 @@
+const getWxToTtApi = () => {
+  return {
+    nextTick (fn) {
+      Promise.resolve().then(fn)
+    }
+  }
+}
+
+export default getWxToTtApi

package/src/mini/transform.js

@@ -1,6 +1,7 @@
 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()
 
@@ -14,17 +15,19 @@ function transformApi (options) {
   const to = options.to
   const fromTo = joinName(from, to)
   const wxToAliApi = getWxToAliApi({ optimize: options.optimize })
-  const wxToQqApi = getWxToQqApi({ optimize: options.optimize })
+  const wxToQqApi = getWxToQqApi()
+  const wxToTtApi = getWxToTtApi()
   const platformMap = {
-    'wx_ali': wxToAliApi,
-    'wx_qq': wxToQqApi
+    wx_ali: wxToAliApi,
+    wx_qq: wxToQqApi,
+    wx_tt: wxToTtApi
   }
   const needProxy = Object.create(null)
   const excludeMap = makeMap(options.exclude)
-  const transedApi = platformMap[fromTo] || {}
-  Object.keys(envObj).concat(Object.keys(transedApi)).forEach((key) => {
+  const platformApi = platformMap[fromTo] || {}
+  Object.keys(envObj).concat(Object.keys(platformApi)).forEach((key) => {
     if (!excludeMap[key]) {
-      needProxy[key] = envObj[key] || transedApi[key]
+      needProxy[key] = envObj[key] || platformApi[key]
     }
   })
   const result = Object.create(null)

package/src/web/api/base/base64.js

@@ -1,10 +1,10 @@
 // fork base64-js@1.3.1
-var lookup = []
-var revLookup = []
-var Arr = typeof Uint8Array !== 'undefined' ? Uint8Array : Array
+const lookup = []
+const revLookup = []
+const Arr = typeof Uint8Array !== 'undefined' ? Uint8Array : Array
 
-var code = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
-for (var i = 0, len = code.length; i < len; ++i) {
+const code = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'
+for (let i = 0, len = code.length; i < len; ++i) {
   lookup[i] = code[i]
   revLookup[code.charCodeAt(i)] = i
 }
@@ -15,7 +15,7 @@ revLookup['-'.charCodeAt(0)] = 62
 revLookup['_'.charCodeAt(0)] = 63
 
 function getLens (b64) {
-  var len = b64.length
+  const len = b64.length
 
   if (len % 4 > 0) {
     throw new Error('Invalid string. Length must be a multiple of 4')
@@ -23,10 +23,10 @@ function getLens (b64) {
 
   // Trim off extra bytes after placeholder bytes are found
   // See: https://github.com/beatgammit/base64-js/issues/42
-  var validLen = b64.indexOf('=')
+  let validLen = b64.indexOf('=')
   if (validLen === -1) validLen = len
 
-  var placeHoldersLen = validLen === len
+  const placeHoldersLen = validLen === len
     ? 0
     : 4 - (validLen % 4)
 
@@ -35,9 +35,9 @@ function getLens (b64) {
 
 // base64 is 4/3 + up to two characters of the original data
 function byteLength (b64) {
-  var lens = getLens(b64)
-  var validLen = lens[0]
-  var placeHoldersLen = lens[1]
+  const lens = getLens(b64)
+  const validLen = lens[0]
+  const placeHoldersLen = lens[1]
   return ((validLen + placeHoldersLen) * 3 / 4) - placeHoldersLen
 }
 
@@ -46,21 +46,21 @@ function _byteLength (b64, validLen, placeHoldersLen) {
 }
 
 function toByteArray (b64) {
-  var tmp
-  var lens = getLens(b64)
-  var validLen = lens[0]
-  var placeHoldersLen = lens[1]
+  let tmp
+  const lens = getLens(b64)
+  const validLen = lens[0]
+  const placeHoldersLen = lens[1]
 
-  var arr = new Arr(_byteLength(b64, validLen, placeHoldersLen))
+  const arr = new Arr(_byteLength(b64, validLen, placeHoldersLen))
 
-  var curByte = 0
+  let curByte = 0
 
   // if there are placeholders, only get up to the last complete 4 chars
-  var len = placeHoldersLen > 0
+  const len = placeHoldersLen > 0
     ? validLen - 4
     : validLen
 
-  var i
+  let i
   for (i = 0; i < len; i += 4) {
     tmp =
       (revLookup[b64.charCodeAt(i)] << 18) |
@@ -99,9 +99,9 @@ function tripletToBase64 (num) {
 }
 
 function encodeChunk (uint8, start, end) {
-  var tmp
-  var output = []
-  for (var i = start; i < end; i += 3) {
+  let tmp
+  const output = []
+  for (let i = start; i < end; i += 3) {
     tmp =
       ((uint8[i] << 16) & 0xFF0000) +
       ((uint8[i + 1] << 8) & 0xFF00) +
@@ -112,14 +112,14 @@ function encodeChunk (uint8, start, end) {
 }
 
 function fromByteArray (uint8) {
-  var tmp
-  var len = uint8.length
-  var extraBytes = len % 3 // if we have 1 byte left, pad 2 bytes
-  var parts = []
-  var maxChunkLength = 16383 // must be multiple of 3
+  let tmp
+  const len = uint8.length
+  const extraBytes = len % 3 // if we have 1 byte left, pad 2 bytes
+  const parts = []
+  const maxChunkLength = 16383 // must be multiple of 3
 
   // go through the array every three bytes, we'll deal with trailing stuff later
-  for (var i = 0, len2 = len - extraBytes; i < len2; i += maxChunkLength) {
+  for (let i = 0, len2 = len - extraBytes; i < len2; i += maxChunkLength) {
     parts.push(encodeChunk(
       uint8, i, (i + maxChunkLength) > len2 ? len2 : (i + maxChunkLength)
     ))

package/src/web/api/create-selector-query/NodesRef.js

@@ -47,6 +47,7 @@ class NodesRef {
     )
     return this._selectorQuery
   }
+
   // 获取Node节点实例
   node (callback) {
     this._selectorQuery._push(

package/src/web/api/create-selector-query/SelectQuery.js

@@ -167,6 +167,7 @@ class SelectQuery {
     })
     this._queueCb.push(callback)
   }
+
   _isEl (selector) {
     if (Array.isArray(selector)) return this._isEl(selector[0])
     return selector && selector.nodeType === 1

package/src/web/api/device/network/onNetworkStatusChange.js

@@ -1,9 +1,9 @@
-import { inBrowser } from '../../../../common/js/utils'
+import { isBrowser } from '../../../../common/js/utils'
 const fnMap = new Map()
 
 const oldObserveList = new Set()
 
-if (inBrowser) {
+if (isBrowser) {
   window.addEventListener('offline', () => {
     oldObserveList.forEach(fn => fn({ isConnected: false, type: 'none' }))
   })
@@ -14,7 +14,7 @@ if (inBrowser) {
 
 export function onNetworkStatusChange (callbackFn) {
   if (navigator.connection) {
-    let proxyCallback = evt => {
+    const proxyCallback = evt => {
       const isConnected = navigator.onLine
       callbackFn({
         isConnected,

package/src/web/api/event-channel/index.js

@@ -2,10 +2,11 @@ class EventChannel {
   constructor () {
     this.listener = {}
   }
+
   emit (eventName, ...args) {
     const cbs = this.listener[eventName]
     if (cbs) {
-      cbs.map((item, index) => {
+      cbs.forEach((item, index) => {
         try {
           item.fn.apply(this, args)
         } catch (e) {
@@ -17,12 +18,13 @@ class EventChannel {
       })
     }
   }
+
   off (eventName, EventCallback) {
     if (EventCallback) {
       const cbs = this.listener[eventName]
       const copyCbs = []
       if (cbs) {
-        cbs.map((item, index) => {
+        cbs.forEach((item) => {
           if (item.fn !== EventCallback) {
             copyCbs.push(item)
           }
@@ -33,18 +35,22 @@ class EventChannel {
       this.listener[eventName] && (this.listener[eventName].length = 0)
     }
   }
+
   on (eventName, EventCallback) {
     (this.listener[eventName] || (this.listener[eventName] = [])).push({ fn: EventCallback, type: 'on' })
   }
+
   once (eventName, EventCallback) {
     (this.listener[eventName] || (this.listener[eventName] = [])).push({ fn: EventCallback, type: 'once' })
   }
+
   _addListener (eventName, EventCallback, type) {
     (this.listener[eventName] || (this.listener[eventName] = [])).push({ fn: EventCallback, type })
   }
+
   _addListeners (events) {
     if (Object.prototype.toString.call(events) === '[object Object]') {
-      Object.keys(events).map((eventName) => {
+      Object.keys(events).forEach((eventName) => {
         (this.listener[eventName] || (this.listener[eventName] = [])).push({ fn: events[eventName], type: 'on' })
       })
     }

package/src/web/api/modal/Modal.js

@@ -2,7 +2,7 @@ import { ToPromise, webHandleSuccess } from '../../../common/js'
 import '../../../common/stylus/Modal.styl'
 // import { forEach } from '@didi/mpx-fetch/src/util'
 // 汉字为两个字符，字母/数字为一个字符
-let _getLength = (t) => {
+const _getLength = (t) => {
   let len = 0
   for (let i = 0; i < t.length; i++) {
     if (t.charCodeAt(i) > 127 || t.charCodeAt(i) === 94) {
@@ -72,6 +72,7 @@ export default class Modal extends ToPromise {
     this.cancelBtn = cancelBtn
     this.confirmBtn = confirmBtn
   }
+
   show (options = {}) {
     if (options.confirmText && _getLength(options.confirmText) > 8) {
       // eslint-disable-next-line
@@ -126,6 +127,7 @@ export default class Modal extends ToPromise {
 
     return this.toPromiseInitPromise()
   }
+
   hide () {
     if (this.hideTimer) {
       clearTimeout(this.hideTimer)

package/src/web/api/socket/SocketTask.js

@@ -20,23 +20,23 @@ class SocketTask {
   }
 
   get CONNECTING () {
-    return this._socket['CONNECTING'] || 0
+    return this._socket.CONNECTING || 0
   }
 
   get OPEN () {
-    return this._socket['OPEN'] || 1
+    return this._socket.OPEN || 1
   }
 
   get CLOSING () {
-    return this._socket['CLOSING'] || 2
+    return this._socket.CLOSING || 2
   }
 
   get CLOSED () {
-    return this._socket['CLOSED'] || 3
+    return this._socket.CLOSED || 3
   }
 
   get readyState () {
-    return this._socket['readyState']
+    return this._socket.readyState
   }
 
   send (options) {

package/src/web/api/storage/index.js

@@ -1,4 +1,4 @@
-import { webHandleSuccess, webHandleFail } from '../../../common/js'
+import { webHandleSuccess, webHandleFail, hasOwn } from '../../../common/js'
 
 function setStorage (options = {}) {
   const { key, data, success, fail, complete } = options
@@ -43,7 +43,7 @@ function getStorage (options = {}) {
 }
 
 function getStorageSync (key) {
-  let res = getItem(key)
+  const res = getItem(key)
   if (res.result) return res.data
 
   return ''
@@ -53,9 +53,10 @@ function getItem (key) {
   let item
   try {
     item = JSON.parse(window.localStorage.getItem(key))
-  } catch (e) {}
+  } catch (e) {
+  }
 
-  if (item && typeof item === 'object' && item.hasOwnProperty('data')) {
+  if (item && typeof item === 'object' && hasOwn(item, 'data')) {
     return { result: true, data: item.data }
   } else {
     return { result: false }

package/src/web/api/system/index.js

@@ -19,7 +19,7 @@ function getSystemInfoSync () {
   let brand = ''
   let system = ''
 
-  for (let item of phones.entries()) {
+  for (const item of phones.entries()) {
     if (item[1].test(ua)) {
       brand = item[0]
       break

package/src/web/api/tab-bar/index.js

@@ -1,4 +1,4 @@
-import { webHandleSuccess, webHandleFail } from '../../../common/js'
+import { webHandleSuccess, webHandleFail, hasOwn } from '../../../common/js'
 import Vue from 'vue'
 
 function setTabBarStyle (options = {}) {
@@ -9,7 +9,7 @@ function setTabBarStyle (options = {}) {
       rejected = { errMsg: 'setTabBarStyle:fail custom Tabbar' }
     } else {
       'color|selectedColor|backgroundColor|borderStyle'.split('|').forEach((key) => {
-        if (options.hasOwnProperty(key)) {
+        if (hasOwn(options, key)) {
           Vue.set(tabBar, key, options[key])
         }
       })
@@ -37,7 +37,7 @@ function setTabBarItem (options = {}) {
       const item = tabBar.list[options.index]
       if (item) {
         'text|iconPath|selectedIconPath'.split('|').forEach((key) => {
-          if (options.hasOwnProperty(key)) {
+          if (hasOwn(options, key)) {
             Vue.set(item, key, options[key])
           }
         })

package/src/web/api/toast/Toast.js

@@ -3,7 +3,7 @@ import '../../../common/stylus/Toast.styl'
 import '../../../common/stylus/Loading.styl'
 
 function createDom (tag, attrs = {}, children = []) {
-  let dom = document.createElement(tag)
+  const dom = document.createElement(tag)
   Object.keys(attrs).forEach(k => dom.setAttribute(k, attrs[k]))
   children.length && children.forEach(child => dom.appendChild(child))
   return dom

package/src/web/api/window/index.js

@@ -1,8 +1,8 @@
-import { inBrowser } from '../../../common/js/utils'
+import { isBrowser } from '../../../common/js/utils'
 
 const callbacks = []
 
-if (inBrowser) {
+if (isBrowser) {
   window.addEventListener('resize', () => {
     const result = {
       size: {