@mpxjs/api-proxy 2.10.4-beta.6 → 2.10.5-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.10.4-beta.6",
+  "version": "2.10.5-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.4",
+    "@mpxjs/utils": "^2.10.4 | ^2.10.5-beta.1",
     "axios": "^1.7.3"
   },
   "peerDependencies": {

package/src/common/js/utils.js

@@ -1,4 +1,4 @@
-import { hasOwn, noop, getEnvObj, getFocusedNavigation } from '@mpxjs/utils'
+import { hasOwn, noop, getEnvObj, getFocusedNavigation, error as errorHandler, warn as warnHandler } from '@mpxjs/utils'
 import { getCurrentInstance } from '@mpxjs/core'
 
 /**
@@ -47,15 +47,16 @@ const handleSuccess = (opts, getOptions = noop, thisObj) => {
 }
 
 function warn (msg) {
-  console.warn && console.warn(`[@mpxjs/api-proxy warn]:\n ${msg}`)
+  warnHandler(msg, '@mpxjs/api-proxy')
 }
 
 function error (msg) {
-  console.error && console.error(`[@mpxjs/api-proxy error]:\n ${msg}`)
+  errorHandler(msg, '@mpxjs/api-proxy')
 }
+
 function envError (method) {
   return () => {
-    throw Error(`[@mpxjs/api-proxy error]:\n ${__mpx_mode__}环境不支持${method}方法`)
+    errorHandler(`\n ${__mpx_mode__}环境不支持${method}方法`, '@mpxjs/api-proxy')
   }
 }
 
@@ -90,7 +91,7 @@ function failHandle (result, fail, complete) {
 
 function getCurrentPageId () {
   const currentInstance = getCurrentInstance()
-  const id = currentInstance?.getPageId() || getFocusedNavigation()?.pageId || null
+  const id = currentInstance?.proxy?.getPageId() || getFocusedNavigation()?.pageId || null
   return id
 }
 

package/src/platform/api/animation/{animation.react.js → animation.ios.js}

@@ -1,3 +1,4 @@
+import { error } from '../../../common/js'
 class Animation {
   constructor (
     {
@@ -47,7 +48,7 @@ class Animation {
   steps = []
 
   matrix (a, b, c, d, tx, ty) { // Todo
-    console.error('React Native 不支持 matrix 动画')
+    error('React Native 不支持 matrix 动画')
     // this.transform.set('matrix', [a, b, c, d, tx, ty])
     return this
   }
@@ -57,7 +58,7 @@ class Animation {
             a3, b3, c3, d3,
             a4, b4, c4, d4
   ) {
-    console.error('React Native 不支持 matrix3d 动画')
+    error('React Native 不支持 matrix3d 动画')
     // this.transform.set('matrix3d', [ // Todo
     //   a1, b1, c1, d1,
     //   a2, b2, c2, d2,
@@ -78,7 +79,7 @@ class Animation {
     // this.rotateY(y)
     // this.rotateZ(z)
     // this.rotate(angle)
-    console.error('React Native 不支持 transform rotate3d')
+    error('React Native 不支持 transform rotate3d')
     return this
   }
 
@@ -116,13 +117,13 @@ class Animation {
   }
 
   scaleZ (scale) { // Todo Invariant Violation: Invalid transform scaleZ: {"scaleZ":0}
-    console.error('React Native 不支持 transform scaleZ')
+    error('React Native 不支持 transform scaleZ')
     // this.transform.set('scaleZ', scale)
     return this
   }
 
   scale3d (x, y, z) { // Todo Invariant Violation: Invalid transform scaleZ: {"scaleZ":0}
-    console.error('React Native 不支持 transform scaleZ，故不支持 scale3d')
+    error('React Native 不支持 transform scaleZ，故不支持 scale3d')
     // this.scaleX(x)
     // this.scaleY(y)
     // this.scaleZ(z)
@@ -167,14 +168,14 @@ class Animation {
   }
 
   translateZ (translate) { // Todo Invariant Violation: Invalid transform translateZ: {"translateZ":0}
-    console.error('React Native 不支持 transform translateZ')
+    error('React Native 不支持 transform translateZ')
     // [translate] = this._transformUnit(translate)
     // this.transform.set('translateZ', translate)
     return this
   }
 
   translate3d (x, y, z) { // Todo Invariant Violation: Invalid transform translateZ: {"translateZ":0}
-    console.error('React Native 不支持 transform translateZ，故无法支持 translate3d')
+    error('React Native 不支持 transform translateZ，故无法支持 translate3d')
     // [x, y, z] = this._transformUnit(x, y, z)
     // // this.transform.set('translate3d', [x, y, z])
     // this.translateX(x)
@@ -239,7 +240,7 @@ class Animation {
       transformOrigin = DEFAULT.transformOrigin
     } = arg
     if (typeof transformOrigin !== 'string') {
-      console.error('Value of transformOrigin only support string type, please check again')
+      error('Value of transformOrigin only support string type, please check again')
       transformOrigin = DEFAULT.transformOrigin
     }
     this.steps.push({

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

@@ -1,4 +1,4 @@
-import Animation from './animation.react'
+import Animation from './animation'
 
 export const createAnimation = (option) => {
   return new Animation(option)

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

@@ -1,5 +1,5 @@
 import { nextTick } from '../next-tick'
-import { parseDataset } from '@mpxjs/utils'
+import { parseDataset, warn } from '@mpxjs/utils'
 
 let isInit = true
 
@@ -68,7 +68,7 @@ class WebIntersectionObserver {
   observe (targetSelector, callback) {
     nextTick(() => {
       if (!document.querySelector(targetSelector)) {
-        console.warn(`[mpx runtime warn]: Node ${JSON.stringify(targetSelector)} is not found. Intersection observer will not trigger.`)
+        warn(`Node ${JSON.stringify(targetSelector)} is not found. Intersection observer will not trigger.`)
         return
       }
       this._observer = this.initObserver()

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

@@ -1,4 +1,4 @@
-import { isBrowser, throwSSRWarning } from '../../../common/js'
+import { isBrowser, throwSSRWarning, warn } from '../../../common/js'
 
 const allowPlaybackRate = [0.5, 0.8, 1.0, 1.25, 1.5, 2.0]
 export const createVideoContext = (id, context) => {
@@ -22,22 +22,22 @@ export const createVideoContext = (id, context) => {
 
   // todo 进入后台音频播放模式
   __videoContext.requestBackgroundPlayback = () => {
-    console.warn('暂不支持requestBackgroundPlayback API')
+    warn('暂不支持requestBackgroundPlayback API')
   }
 
   // todo 退出后台音频播放
   __videoContext.exitBackgroundPlayback = () => {
-    console.warn('暂不支持exitBackgroundPlayback API')
+    warn('暂不支持exitBackgroundPlayback API')
   }
 
   // todo 退出小窗，该方法可在任意页面调用
   __videoContext.exitPictureInPicture = ({ success, fail, complete }) => {
-    console.warn('暂不支持exitPictureInPicture API')
+    warn('暂不支持exitPictureInPicture API')
   }
 
   // todo 发送弹幕
   __videoContext.sendDanmu = ({ text, color }) => {
-    console.warn('暂不支持发送弹幕')
+    warn('暂不支持发送弹幕')
   }
 
   // 进入全屏
@@ -90,7 +90,7 @@ export const createVideoContext = (id, context) => {
   // 设置倍速播放
   __videoContext.playbackRate = (number) => {
     if (allowPlaybackRate.indexOf(number) === -1) {
-      console.warn(`不支持${number}倍速播放`)
+      warn(`不支持${number}倍速播放`)
       return
     }
     __videoNode.playbackRate = number