@mpxjs/api-proxy 2.9.0-beta.1 → 2.9.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.9.0-beta.1",
+  "version": "2.9.0-beta.3",
   "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": "5e4b44c9b8132e9192cfd119f63196ecc6c4486c"
+  "gitHead": "521f0cec1231962f9c071c8b70499772a0a81fda"
 }

package/src/web/api/create-intersection-observer/IntersectionObserver.js

@@ -97,16 +97,8 @@ class WebIntersectionObserver {
     nextTick(() => {
       const marginsTemp = margins || {}
       const { left = 0, right = 0, top = 0, bottom = 0 } = marginsTemp
-      this._root = document.querySelector('html')
-      const viewportWidth = window.innerWidth || document.documentElement.clientWidth
-      const viewportHeight = window.innerHeight || document.documentElement.clientHeight
-      const rootWidth = this._root.offsetWidth || 0
-      const rootHeight = this._root.offsetHeight || 0
-      if (rootHeight >= viewportHeight) {
-        this._rootMargin = `${top}px ${viewportWidth - rootWidth + right}px ${viewportHeight - rootHeight + bottom}px ${left}px`
-      } else {
-        this._rootMargin = `${top}px ${right}px ${bottom}px ${left}px`
-      }
+      this._root = null
+      this._rootMargin = `${top}px ${right}px ${bottom}px ${left}px`
       this._relativeInfo.push({ selector: null, margins })
     })
     return this

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

@@ -75,7 +75,7 @@ class SelectQuery {
   }
 
   _handleFields (fields, el, selector) {
-    if (!el) return null
+    if (!el || (el && !el.getBoundingClientRect)) return null
     const { id, dataset, rect, size, scrollOffset, properties = [], computedStyle = [], node } = fields
     const { left, right, top, bottom, width, height } = el.getBoundingClientRect()
 

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

@@ -19,13 +19,13 @@ class EventChannel {
     }
   }
 
-  off (eventName, EventCallback) {
-    if (EventCallback) {
+  off (eventName, listener) {
+    if (listener) {
       const cbs = this.listener[eventName]
       const copyCbs = []
       if (cbs) {
         cbs.forEach((item) => {
-          if (item.fn !== EventCallback) {
+          if (item.fn !== listener) {
             copyCbs.push(item)
           }
         })
@@ -36,26 +36,25 @@ class EventChannel {
     }
   }
 
-  on (eventName, EventCallback) {
-    (this.listener[eventName] || (this.listener[eventName] = [])).push({ fn: EventCallback, type: 'on' })
+  on (eventName, listener) {
+    this._addListener(eventName, listener, 'on')
   }
 
-  once (eventName, EventCallback) {
-    (this.listener[eventName] || (this.listener[eventName] = [])).push({ fn: EventCallback, type: 'once' })
+  once (eventName, listener) {
+    this._addListener(eventName, listener, 'once')
   }
 
-  _addListener (eventName, EventCallback, type) {
-    (this.listener[eventName] || (this.listener[eventName] = [])).push({ fn: EventCallback, type })
+  _addListener (eventName, listener, type) {
+    (this.listener[eventName] || (this.listener[eventName] = [])).push({ fn: listener, type })
   }
 
   _addListeners (events) {
-    if (Object.prototype.toString.call(events) === '[object Object]') {
-      Object.keys(events).forEach((eventName) => {
-        (this.listener[eventName] || (this.listener[eventName] = [])).push({ fn: events[eventName], type: 'on' })
-      })
-    }
+    Object.keys(events).forEach((eventName) => {
+      this.on(eventName, events[eventName])
+    })
   }
 }
+
 export {
   EventChannel
 }

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

@@ -39,7 +39,17 @@ function request (options = { url: '' }) {
     headers: header,
     responseType,
     timeout,
-    cancelToken: source.token
+    cancelToken: source.token,
+    transitional: {
+      // silent JSON parsing mode
+      // `true`  - ignore JSON parsing errors and set response.data to null if parsing failed (old behaviour)
+      // `false` - throw SyntaxError if JSON parsing failed (Note: responseType must be set to 'json')
+      silentJSONParsing: true, // default value for the current Axios version
+      // try to parse the response string as JSON even if `responseType` is not 'json'
+      forcedJSONParsing: false,
+      // throw ETIMEDOUT error instead of generic ECONNABORTED on request timeouts
+      clarifyTimeoutError: false
+    }
   }
 
   if (method === 'GET') {
@@ -49,7 +59,7 @@ function request (options = { url: '' }) {
 
   const promise = axios(rOptions).then(res => {
     let data = res.data
-    if (responseType === 'text' && dataType === 'json') {
+    if (dataType === 'json' && typeof data === 'string') {
       try {
         data = JSON.parse(data)
       } catch (e) {

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

@@ -1,5 +1,8 @@
 import { webHandleSuccess, webHandleFail, isTabBarPage, throwSSRWarning, isBrowser } from '../../../common/js'
 import { EventChannel } from '../event-channel'
+
+let routeCount = 0
+
 function redirectTo (options = {}) {
   if (!isBrowser) {
     throwSSRWarning('redirectTo API is running in non browser environments')
@@ -12,11 +15,17 @@ 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
     return new Promise((resolve, reject) => {
       router.replace(
         {
-          path: options.url
+          path: options.url,
+          query: {
+            routeCount: ++routeCount
+          }
         },
         () => {
           const res = { errMsg: 'redirectTo:ok' }
@@ -53,10 +62,14 @@ function navigateTo (options = {}) {
     if (options.events) {
       eventChannel._addListeners(options.events)
     }
+    if (routeCount === 0 && router.currentRoute.query.routeCount) routeCount = router.currentRoute.query.routeCount
     return new Promise((resolve, reject) => {
       router.push(
         {
-          path: options.url
+          path: options.url,
+          query: {
+            routeCount: ++routeCount
+          }
         },
         () => {
           const res = { errMsg: 'navigateTo:ok', eventChannel }
@@ -80,7 +93,11 @@ function navigateBack (options = {}) {
   }
   const router = global.__mpxRouter
   if (router) {
-    const delta = options.delta || 1
+    let delta = options.delta || 1
+    const stackLength = router.stack.length
+    if (stackLength > 1 && delta >= stackLength) {
+      delta = stackLength - 1
+    }
     router.__mpxAction = {
       type: 'back',
       delta
@@ -92,8 +109,6 @@ function navigateBack (options = {}) {
   }
 }
 
-let reLaunchCount = 0
-
 function reLaunch (options = {}) {
   if (!isBrowser) {
     throwSSRWarning('reLaunch API is running in non browser environments')
@@ -101,14 +116,14 @@ function reLaunch (options = {}) {
   }
   const router = global.__mpxRouter
   if (router) {
-    if (reLaunchCount === 0 && router.currentRoute.query.reLaunchCount) reLaunchCount = router.currentRoute.query.reLaunchCount
-    const delta = router.stack.length - 1
+    if (routeCount === 0 && router.currentRoute.query.routeCount) routeCount = router.currentRoute.query.routeCount
     router.__mpxAction = {
       type: 'reLaunch',
       path: options.url,
-      reLaunchCount: ++reLaunchCount,
+      routeCount: ++routeCount,
       replaced: false
     }
+    const delta = router.stack.length - 1
     // 在需要操作后退时，先操作后退，在beforeEach中基于当前action通过next()进行replace操作，避免部分浏览器的表现不一致
     if (delta > 0) {
       router.go(-delta)
@@ -119,7 +134,7 @@ function reLaunch (options = {}) {
           {
             path: options.url,
             query: {
-              reLaunchCount
+              routeCount
             }
           },
           () => {
@@ -156,12 +171,12 @@ function switchTab (options = {}) {
         webHandleFail(res, options.fail, options.complete)
         return Promise.reject(res)
       }
-      const delta = router.stack.length - 1
       router.__mpxAction = {
         type: 'switch',
         path: options.url,
         replaced: false
       }
+      const delta = router.stack.length - 1
       if (delta > 0) {
         router.go(-delta)
       } else {