@mpxjs/api-proxy 2.10.6-beta.4 → 2.10.7-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.10.6-beta.4",
+  "version": "2.10.7-beta.1",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
@@ -37,7 +37,7 @@
   },
   "homepage": "https://github.com/didi/mpx#readme",
   "dependencies": {
-    "@mpxjs/utils": "^2.10.6 | ^2.10.6-beta.1",
+    "@mpxjs/utils": "^2.10.7 | ^2.10.7-beta.1",
     "axios": "^1.7.3"
   },
   "peerDependencies": {

package/src/common/js/utils.js

@@ -95,6 +95,30 @@ function getCurrentPageId () {
   return id
 }
 
+function resolvePath (relative, base) {
+  const firstChar = relative.charAt(0)
+  if (firstChar === '/') {
+    return relative
+  }
+  const stack = base.split('/')
+  stack.pop()
+  // resolve relative path
+  const segments = relative.replace(/^\//, '').split('/')
+  for (let i = 0; i < segments.length; i++) {
+    const segment = segments[i]
+    if (segment === '..') {
+      stack.pop()
+    } else if (segment !== '.') {
+      stack.push(segment)
+    }
+  }
+  // ensure leading slash
+  if (stack[0] !== '') {
+    stack.unshift('')
+  }
+  return stack.join('/')
+}
+
 const ENV_OBJ = getEnvObj()
 
 export {
@@ -110,5 +134,6 @@ export {
   successHandle,
   failHandle,
   getFocusedNavigation,
-  getCurrentPageId
+  getCurrentPageId,
+  resolvePath
 }

package/src/platform/api/route/index.ios.js

@@ -1,6 +1,7 @@
-import { successHandle, failHandle } from '../../../common/js'
+import { successHandle, failHandle, resolvePath } from '../../../common/js'
 import { parseUrlQuery as parseUrl } from '@mpxjs/utils'
 import { nextTick } from '../next-tick'
+import { EventChannel } from '../event-channel'
 
 function getBasePath (navigation) {
   if (navigation) {
@@ -10,29 +11,6 @@ function getBasePath (navigation) {
   return '/'
 }
 
-function resolvePath (relative, base) {
-  const firstChar = relative.charAt(0)
-  if (firstChar === '/') {
-    return relative
-  }
-  const stack = base.split('/')
-  stack.pop()
-  // resolve relative path
-  const segments = relative.replace(/^\//, '').split('/')
-  for (let i = 0; i < segments.length; i++) {
-    const segment = segments[i]
-    if (segment === '..') {
-      stack.pop()
-    } else if (segment !== '.') {
-      stack.push(segment)
-    }
-  }
-  // ensure leading slash
-  if (stack[0] !== '') {
-    stack.unshift('')
-  }
-  return stack.join('/')
-}
 let timerId = null
 function isLock (navigationHelper, type, options) {
   if (navigationHelper.lastSuccessCallback && navigationHelper.lastFailCallback) {
@@ -57,12 +35,21 @@ function navigateTo (options = {}) {
   }
   const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
   if (navigation && navigationHelper) {
+    const eventChannel = new EventChannel()
+    if (options.events) {
+      eventChannel._addListeners(options.events)
+    }
     const { path, queryObj } = parseUrl(options.url)
     const basePath = getBasePath(navigation)
     const finalPath = resolvePath(path, basePath).slice(1)
+
+    global.__mpxEventChannel = {
+      route: finalPath,
+      eventChannel
+    }
     navigation.push(finalPath, queryObj)
     navigationHelper.lastSuccessCallback = () => {
-      const res = { errMsg: 'navigateTo:ok' }
+      const res = { errMsg: 'navigateTo:ok', eventChannel }
       successHandle(res, options.success, options.complete)
     }
     navigationHelper.lastFailCallback = (msg) => {

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

@@ -1,4 +1,4 @@
-import { successHandle, failHandle, isTabBarPage, throwSSRWarning, isBrowser } from '../../../common/js'
+import { successHandle, failHandle, isTabBarPage, throwSSRWarning, isBrowser, resolvePath } from '../../../common/js'
 import { EventChannel } from '../event-channel'
 
 let routeCount = 0
@@ -46,9 +46,13 @@ function navigateTo (options = {}) {
       const res = { errMsg: 'navigateTo:fail can not navigateTo a tabBar page' }
       failHandle(res, options.fail, options.complete)
     }
+    const finalPath = resolvePath(options.url, router.currentRoute.path).slice(1)
     const eventChannel = new EventChannel()
     router.__mpxAction = {
-      type: 'to',
+      type: 'to'
+    }
+    global.__mpxEventChannel = {
+      route: finalPath,
       eventChannel
     }
     if (options.events) {