Feat api proxy promisify

packages/api-proxy/__tests__/web/toast.spec.js

@@ -1,7 +1,7 @@
 import '@testing-library/jest-dom/extend-expect'
 import {
   showToast, hideToast
-} from '../../src/web/api//toast/index'
+} from '../../src/web/api/toast/index'
 
 describe('test toast', () => {
   afterAll(() => {

packages/api-proxy/src/common/js/index.js

@@ -1,3 +1,4 @@
 export * from './ToPromise'
 export * from './web'
 export * from './utils'
+export * from './promisify'

packages/api-proxy/src/mini/promisify.js → packages/api-proxy/src/common/js/promisify.js

@@ -1,4 +1,4 @@
-import { genFromMap, getEnvObj, noop } from '../common/js'
+import { genFromMap, getEnvObj, noop } from './utils'
 
 const envObj = getEnvObj()
 
@@ -21,6 +21,7 @@ const blackList = [
   'createSelectorQuery',
   'createIntersectionObserver',
   'hideKeyboard',
+  // todo 小程序支持 promise 风格调用
   'stopPullDownRefresh',
   'createWorker',
   'pageScrollTo',
@@ -96,4 +97,6 @@ function promisify (listObj, whiteList, customBlackList) {
   return result
 }
 
-export default promisify
+export {
+  promisify
+}

packages/api-proxy/src/index.js

@@ -1,5 +1,5 @@
 import transformApi from './mini/transform'
-import promisify from './mini/promisify'
+import { promisify } from './common/js'
 
 export default function install (target, options = {}) {
   const {

packages/api-proxy/src/index.web.js

@@ -1,9 +1,15 @@
-import * as allApi from './web/api'
-import { genFromMap } from './common/js'
+import * as transedApi from './web/api'
+import { promisify, genFromMap } from './common/js'
 
-export default function install (target) {
+export default function install (target, options = {}) {
+  const {
+    usePromise = false, // 是否转为 promise 格式
+    whiteList = [], // 强制变成 promise 格式的 api
+    blackList = [] // 强制不变成 promise 格式的 api
+  } = options
   const fromMap = genFromMap()
-
+  const promisedApi = usePromise ? promisify(transedApi, whiteList, blackList) : {}
+  const allApi = Object.assign({}, transedApi, promisedApi)
   Object.keys(allApi).forEach(api => {
     target[api] = function (...args) {
       if (args.length > 0) {

packages/api-proxy/src/web/api/action-sheet/ActionSheet.js

@@ -64,7 +64,6 @@ export default class ActionSheet extends ToPromise {
           tapIndex: index
         }
         webHandleSuccess(res, opts.success, opts.complete)
-        this.toPromiseResolve(res)
       }
       list.appendChild(sheet)
     })
@@ -77,13 +76,10 @@ export default class ActionSheet extends ToPromise {
       this.hide()
       const err = { errMsg: 'showActionSheet:fail cancel' }
       webHandleFail(err, opts.fail, opts.complete)
-      !opts.fail && this.toPromiseReject(err)
     }
 
     this.box.classList.add('show')
     this.actionSheet.classList.add('show')
-
-    return this.toPromiseInitPromise()
   }
 
   hide () {

packages/api-proxy/src/web/api/modal/Modal.js

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

packages/api-proxy/src/web/api/pull-down/index.js

@@ -20,17 +20,13 @@ function stopPullDownRefresh (options = {}) {
         }
       }
     }
-    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)
-      }
-    })
+    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)
+    }
   }
 }
 
@@ -54,17 +50,13 @@ function startPullDownRefresh (options = {}) {
         }
       }
     }
-    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)
-      }
-    })
+    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)
+    }
   }
 }
 

packages/api-proxy/src/web/api/request/index.js

@@ -47,7 +47,7 @@ function request (options = { url: '' }) {
     delete rOptions.data
   }
 
-  const promise = axios(rOptions).then(res => {
+  axios(rOptions).then(res => {
     let data = res.data
     if (responseType === 'text' && dataType === 'json') {
       try {
@@ -70,9 +70,7 @@ function request (options = { url: '' }) {
       return Promise.reject(res)
     }
   })
-
-  promise.__returned = requestTask
-  return promise
+  return requestTask
 }
 
 export {

packages/api-proxy/src/web/api/route/index.js

@@ -13,23 +13,19 @@ function redirectTo (options = {}) {
       return Promise.reject(res)
     }
     router.__mpxAction = { type: 'redirect' }
-    return new Promise((resolve, reject) => {
-      router.replace(
-        {
-          path: options.url
-        },
-        () => {
-          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)
-        }
-      )
-    })
+    router.replace(
+      {
+        path: options.url
+      },
+      () => {
+        const res = { errMsg: 'redirectTo:ok' }
+        webHandleSuccess(res, options.success, options.complete)
+      },
+      err => {
+        const res = { errMsg: `redirectTo:fail ${err}` }
+        webHandleFail(res, options.fail, options.complete)
+      }
+    )
   }
 }
 
@@ -53,23 +49,19 @@ function navigateTo (options = {}) {
     if (options.events) {
       eventChannel._addListeners(options.events)
     }
-    return new Promise((resolve, reject) => {
-      router.push(
-        {
-          path: options.url
-        },
-        () => {
-          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)
-        }
-      )
-    })
+    router.push(
+      {
+        path: options.url
+      },
+      () => {
+        const res = { errMsg: 'navigateTo:ok', eventChannel }
+        webHandleSuccess(res, options.success, options.complete)
+      },
+      err => {
+        const res = { errMsg: err }
+        webHandleFail(res, options.fail, options.complete)
+      }
+    )
   }
 }
 
@@ -88,7 +80,6 @@ function navigateBack (options = {}) {
     router.go(-delta)
     const res = { errMsg: 'navigateBack:ok' }
     webHandleSuccess(res, options.success, options.complete)
-    return Promise.resolve(res)
   }
 }
 
@@ -114,30 +105,25 @@ function reLaunch (options = {}) {
       router.go(-delta)
     } else {
       router.__mpxAction.replaced = true
-      return new Promise((resolve, reject) => {
-        router.replace(
-          {
-            path: options.url,
-            query: {
-              reLaunchCount
-            }
-          },
-          () => {
-            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)
+      router.replace(
+        {
+          path: options.url,
+          query: {
+            reLaunchCount
           }
-        )
-      })
+        },
+        () => {
+          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)
   }
 }
 
@@ -166,28 +152,23 @@ function switchTab (options = {}) {
         router.go(-delta)
       } else {
         router.__mpxAction.replaced = true
-        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)
-            }
-          )
-        })
+        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)
+          }
+        )
       }
     }
     const res = { errMsg: 'switchTab:ok' }
     webHandleSuccess(res, options.success, options.complete)
-    return Promise.resolve(res)
   }
 }