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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.9.11-test.0",
+  "version": "2.9.14",
   "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": "d244d661acb081b709fc99ca8f6add541f793877"
+  "gitHead": "e8ab845a544d2db0619a6a7d6c04d9d384d1a6ca"
 }

package/src/common/js/promisify.js

@@ -1,4 +1,4 @@
-import { genFromMap, getEnvObj, noop } from './utils'
+import { getEnvObj, noop } from './utils'
 
 const envObj = getEnvObj()
 
@@ -20,6 +20,7 @@ const blackList = [
   'createAnimationVideo',
   'createSelectorQuery',
   'createIntersectionObserver',
+  'getPerformance',
   'hideKeyboard',
   'stopPullDownRefresh',
   'createWorker',
@@ -47,7 +48,6 @@ function promisify (listObj, whiteList, customBlackList) {
   const result = {}
   const whiteListMap = getMapFromList(whiteList)
   const blackListMap = getMapFromList(blackList.concat(customBlackList))
-  const fromMap = genFromMap()
 
   function promisifyFilter (key) {
     if (whiteListMap && whiteListMap[key] !== undefined) {
@@ -69,7 +69,7 @@ function promisify (listObj, whiteList, customBlackList) {
 
     result[key] = function (...args) {
       if (promisifyFilter(key)) {
-        if (!args[0] || fromMap[args[0]]) {
+        if (!args[0]) {
           args.unshift({ success: noop, fail: noop })
         }
         const obj = args[0]

package/src/common/js/utils.js

@@ -49,15 +49,6 @@ const handleSuccess = (opts, getOptions = noop, thisObj) => {
   }
 }
 
-function genFromMap () {
-  const result = {}
-  const platforms = ['wx', 'ali', 'swan', 'qq', 'tt', 'web', 'qa', 'jd', 'dd']
-  platforms.forEach((platform) => {
-    result[`__mpx_src_mode_${platform}__`] = platform
-  })
-  return result
-}
-
 function getEnvObj () {
   switch (__mpx_mode__) {
     case 'wx':
@@ -81,29 +72,6 @@ function getEnvObj () {
   }
 }
 
-function getEnvStr () {
-  switch (__mpx_mode__) {
-    case 'wx':
-      return 'wx'
-    case 'ali':
-      return 'ali'
-    case 'swan':
-      return 'swan'
-    case 'qq':
-      return 'qq'
-    case 'tt':
-      return 'tt'
-    case 'jd':
-      return 'jd'
-    case 'qa':
-      return 'qa'
-    case 'dd':
-      return 'dd'
-    case 'web':
-      return 'web'
-  }
-}
-
 function warn (msg) {
   console.warn && console.warn(`[@mpxjs/api-proxy warn]:\n ${msg}`)
 }
@@ -135,9 +103,7 @@ function throwSSRWarning (info) {
 export {
   changeOpts,
   handleSuccess,
-  genFromMap,
   getEnvObj,
-  getEnvStr,
   error,
   envError,
   warn,

package/src/index.js

@@ -1,4 +1,5 @@
 import install, { getProxy } from './install'
+import promisify from './common/js/promisify'
 export * from './platform'
-export { getProxy }
+export { getProxy, promisify }
 export default install

package/src/install.js

@@ -1,5 +1,5 @@
 import * as platformApi from './platform'
-import { getEnvObj, getEnvStr } from './common/js'
+import { getEnvObj } from './common/js'
 import promisify from './common/js/promisify'
 
 export default function install (target, options = {}) {
@@ -7,52 +7,12 @@ export default function install (target, options = {}) {
     usePromise = false, // 是否转为 promise 格式
     whiteList = [], // 强制变成 promise 格式的 api
     blackList = [], // 强制不变成 promise 格式的 api
-    custom = {}, // 自定义转化规则
-    fallbackMap = {} // 对于不支持的API，允许配置一个映射表，接管不存在的API
+    custom = {} // 自定义转化规则
   } = 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 envObj = getEnvObj()
+  const transedApi = Object.assign({}, envObj, platformApi)
   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]
-      }
-    })
+  Object.assign(target, transedApi, promisedApi, custom[__mpx_mode__])
 }
 
 export function getProxy (options = {}) {

package/src/platform/api/canvas/index.ali.js

@@ -1,4 +1,4 @@
-import { changeOpts, handleSuccess } from '../../../common/js'
+import { changeOpts, envError, handleSuccess } from '../../../common/js'
 
 function canvasToTempFilePath (options = {}) {
   handleSuccess(options, res => {
@@ -10,7 +10,11 @@ function canvasToTempFilePath (options = {}) {
 
   my.canvasToTempFilePath(options)
 }
+const createCanvasContext = envError('createCanvasContext')
+const canvasGetImageData = envError('canvasGetImageData')
 
 export {
-  canvasToTempFilePath
+  createCanvasContext,
+  canvasToTempFilePath,
+  canvasGetImageData
 }

package/src/platform/api/device/network/getNetworkType.js

@@ -1,6 +1,6 @@
 import { webHandleSuccess, webHandleFail, isBrowser, throwSSRWarning } from '../../../../common/js'
 
-export function getNetworkType ({ success, fail = () => {}, complete = () => {} }) {
+export function getNetworkType ({ success, fail = () => {}, complete = () => {} } = {}) {
   if (!isBrowser) {
     throwSSRWarning('getNetworkType API is running in non browser environments')
     return

package/src/platform/api/image/index.web.js

@@ -1,4 +1,5 @@
 import Preview from './Preview'
+import { envError } from '../../../common/js'
 
 let preview = null
 
@@ -6,7 +7,13 @@ let preview = null
  * 预览图片
  * @param {Object} options - 预览图片的配置项
  */
-export const previewImage = (options) => {
+const previewImage = (options) => {
   if (!preview) preview = new Preview()
   preview.show(options)
 }
+const compressImage = envError('compressImage')
+
+export {
+  previewImage,
+  compressImage
+}

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

@@ -93,6 +93,5 @@ export default class Toast {
       this.toast.classList.remove('show')
       this.toast.remove() // hide 则卸载
     }, duration)
-    // return Promise.resolve({ errMsg }) todo 验证一下
   }
 }