@mpxjs/core 2.9.38 → 2.9.41-react.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.9.38",
+  "version": "2.9.41-react.0",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -19,18 +19,52 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@mpxjs/utils": "^2.9.38",
+    "@mpxjs/utils": "^2.9.41-react.0",
     "lodash": "^4.1.1",
     "miniprogram-api-typings": "^3.10.0"
   },
   "peerDependencies": {
     "@mpxjs/api-proxy": "^2.9.0",
     "@mpxjs/store": "^2.9.0",
+    "@react-navigation/native": "^6.1.17",
+    "@react-navigation/native-stack": "^6.9.26",
+    "react": "^18.3.1",
+    "react-native": "^0.74.3",
+    "react-native-root-siblings": "^5.0.1",
     "vue": "^2.7.10",
     "vue-demi": "^0.14.6",
     "vue-i18n": "^8.27.2",
     "vue-i18n-bridge": "^9.2.2"
   },
+  "peerDependenciesMeta": {
+    "vue": {
+      "optional": true
+    },
+    "vue-demi": {
+      "optional": true
+    },
+    "vue-i18n": {
+      "optional": true
+    },
+    "vue-i18n-bridge": {
+      "optional": true
+    },
+    "react": {
+      "optional": true
+    },
+    "react-native": {
+      "optional": true
+    },
+    "@react-navigation/native": {
+      "optional": true
+    },
+    "@react-navigation/native-stack": {
+      "optional": true
+    },
+    "react-native-root-siblings": {
+      "optional": true
+    }
+  },
   "publishConfig": {
     "registry": "https://registry.npmjs.org",
     "access": "public"
@@ -47,5 +81,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "5e2740e2091edda91eda9ffe775989c7fd9838df"
+  "gitHead": "1c9ae7527a257fad98f5536114e63415cea54271"
 }

package/src/convertor/convertor.js

@@ -11,6 +11,7 @@ import wxToQqRule from './wxToQq'
 import wxToTtRule from './wxToTt'
 import wxToDdRule from './wxToDd'
 import wxToJdRule from './wxToJd'
+import wxToReactRule from './wxToReact'
 
 // 根据当前环境获取的默认生命周期信息
 let lifecycleInfo
@@ -55,7 +56,9 @@ const rulesMap = {
   wxToQq: { ...defaultConvertRule, ...wxToQqRule },
   wxToTt: { ...defaultConvertRule, ...wxToTtRule },
   wxToDd: { ...defaultConvertRule, ...wxToDdRule },
-  wxToJd: { ...defaultConvertRule, ...wxToJdRule }
+  wxToJd: { ...defaultConvertRule, ...wxToJdRule },
+  wxToIos: { ...defaultConvertRule, ...wxToReactRule },
+  wxToAndroid: { ...defaultConvertRule, ...wxToReactRule }
 }
 
 export function getConvertRule (convertMode) {

package/src/convertor/getConvertMode.js

@@ -5,7 +5,9 @@ const convertModes = {
   'wx-qq': 'wxToQq',
   'wx-tt': 'wxToTt',
   'wx-jd': 'wxToJd',
-  'wx-dd': 'wxToDd'
+  'wx-dd': 'wxToDd',
+  'wx-ios': 'wxToIos',
+  'wx-android': 'wxToAndroid'
 }
 
 export function getConvertMode (srcMode) {

package/src/convertor/wxToReact.js

@@ -0,0 +1,31 @@
+import {
+  error,
+  isDev
+} from '@mpxjs/utils'
+import { implemented } from '../core/implement'
+
+// 暂不支持的wx选项，后期需要各种花式支持
+const unsupported = ['relations', 'moved', 'definitionFilter', 'onShareAppMessage', 'options', 'behaviors', 'externalClasses']
+
+function convertErrorDesc (key) {
+  error(`Options.${key} is not supported in runtime conversion from wx to react native.`, global.currentResource)
+}
+
+function notSupportTip (options) {
+  unsupported.forEach(key => {
+    if (options[key]) {
+      if (!implemented[key]) {
+        isDev && convertErrorDesc(key)
+        delete options[key]
+      } else if (implemented[key].remove) {
+        delete options[key]
+      }
+    }
+  })
+}
+
+export default {
+  convert (options) {
+    notSupportTip(options)
+  }
+}

package/src/core/proxy.js

@@ -27,7 +27,8 @@ import {
   callWithErrorHandling,
   warn,
   error,
-  getEnvObj
+  getEnvObj,
+  isReact
 } from '@mpxjs/utils'
 import {
   BEFORECREATE,
@@ -44,6 +45,8 @@ import {
   ONHIDE,
   ONRESIZE
 } from './innerLifecycle'
+import contextMap from '../dynamic/vnode/context'
+import { getAst } from '../dynamic/astCache'
 
 let uid = 0
 
@@ -126,11 +129,15 @@ export default class MpxProxy {
       this.forceUpdateAll = false
       this.currentRenderTask = null
       this.propsUpdatedFlag = false
+      // react专用，正确触发updated钩子
+      this.pendingUpdatedFlag = false
     }
     this.initApi()
   }
 
   created () {
+    // 缓存上下文，在 destoryed 阶段删除
+    contextMap.set(this.uid, this.target)
     if (__mpx_mode__ !== 'web') {
       // web中BEFORECREATE钩子通过vue的beforeCreate钩子单独驱动
       this.callHook(BEFORECREATE)
@@ -146,7 +153,7 @@ export default class MpxProxy {
     this.state = CREATED
     this.callHook(CREATED)
 
-    if (__mpx_mode__ !== 'web') {
+    if (__mpx_mode__ !== 'web' && !isReact) {
       this.initRender()
     }
 
@@ -168,9 +175,9 @@ export default class MpxProxy {
 
   mounted () {
     if (this.state === CREATED) {
-      this.state = MOUNTED
       // 用于处理refs等前置工作
       this.callHook(BEFOREMOUNT)
+      this.state = MOUNTED
       this.callHook(MOUNTED)
       this.currentRenderTask && this.currentRenderTask.resolve()
     }
@@ -190,11 +197,13 @@ export default class MpxProxy {
   }
 
   unmounted () {
+    // 页面/组件销毁清除上下文的缓存
+    contextMap.remove(this.uid)
     this.callHook(BEFOREUNMOUNT)
     this.scope?.stop()
     if (this.update) this.update.active = false
-    this.callHook(UNMOUNTED)
     this.state = UNMOUNTED
+    this.callHook(UNMOUNTED)
   }
 
   isUnmounted () {
@@ -230,7 +239,12 @@ export default class MpxProxy {
   }
 
   initProps () {
-    this.props = diffAndCloneA(this.target.__getProps(this.options)).clone
+    if (isReact) {
+      // react模式下props内部对象透传无需深clone，依赖对象深层的数据响应触发子组件更新
+      this.props = this.target.__getProps()
+    } else {
+      this.props = diffAndCloneA(this.target.__getProps(this.options)).clone
+    }
     reactive(this.props)
     proxy(this.target, this.props, undefined, false, this.createProxyConflictHandler('props'))
   }
@@ -379,7 +393,10 @@ export default class MpxProxy {
     this.doRender(this.processRenderDataWithStrictDiff(renderData))
   }
 
-  renderWithData (skipPre) {
+  renderWithData (skipPre, vnode) {
+    if (vnode) {
+      return this.doRenderWithVNode(vnode)
+    }
     const renderData = skipPre ? this.renderData : preProcessRenderData(this.renderData)
     this.doRender(this.processRenderDataWithStrictDiff(renderData))
     // 重置renderData准备下次收集
@@ -478,6 +495,25 @@ export default class MpxProxy {
     return result
   }
 
+  doRenderWithVNode (vnode) {
+    if (!this._vnode) {
+      this.target.__render({ r: vnode })
+    } else {
+      let diffPath = diffAndCloneA(vnode, this._vnode).diffData
+      if (!isEmptyObject(diffPath)) {
+        // 构造 diffPath 数据
+        diffPath = Object.keys(diffPath).reduce((preVal, curVal) => {
+          const key = 'r' + curVal
+          preVal[key] = diffPath[curVal]
+          return preVal
+        }, {})
+        this.target.__render(diffPath)
+      }
+    }
+    // 缓存本地的 vnode 用以下一次 diff
+    this._vnode = diffAndCloneA(vnode).clone
+  }
+
   doRender (data, cb) {
     if (typeof this.target.__render !== 'function') {
       error('Please specify a [__render] function to render view.', this.options.mpxFileResource)
@@ -545,12 +581,30 @@ export default class MpxProxy {
     const _c = this.target._c.bind(this.target)
     const _r = this.target._r.bind(this.target)
     const _sc = this.target._sc.bind(this.target)
+    const _g = this.target._g?.bind(this.target)
+    const __getAst = this.target.__getAst?.bind(this.target)
+    const moduleId = this.target.__moduleId
+    const dynamicTarget = this.target.__dynamic
+
     const effect = this.effect = new ReactiveEffect(() => {
       // pre render for props update
       if (this.propsUpdatedFlag) {
         this.updatePreRender()
       }
-
+      if (dynamicTarget || __getAst) {
+        try {
+          const ast = getAst(__getAst, moduleId)
+          return _r(false, _g(ast, moduleId))
+        } catch (e) {
+          e.errType = 'mpx-dynamic-render'
+          e.errmsg = e.message
+          if (!__mpx_dynamic_runtime__) {
+            return error('Please make sure you have set dynamicRuntime true in mpx webpack plugin config because you have use the dynamic runtime feature.', this.options.mpxFileResource, e)
+          } else {
+            return error('Dynamic rendering error', this.options.mpxFileResource, e)
+          }
+        }
+      }
       if (this.target.__injectedRender) {
         try {
           return this.target.__injectedRender(_i, _c, _r, _sc)
@@ -596,6 +650,20 @@ export default class MpxProxy {
       this.forceUpdateAll = true
     }
 
+    if (isReact) {
+      // rn中不需要setdata
+      this.forceUpdateData = {}
+      this.forceUpdateAll = false
+      if (this.update) {
+        options.sync ? this.update() : queueJob(this.update)
+      }
+      if (callback) {
+        callback = callback.bind(this.target)
+        options.sync ? callback() : nextTick(callback)
+      }
+      return
+    }
+
     if (this.effect) {
       options.sync ? this.effect.run() : this.effect.update()
     } else {

package/src/core/transferOptions.js

@@ -7,6 +7,10 @@ export default function transferOptions (options, type, needConvert = true) {
   let currentInject
   if (global.currentInject && global.currentInject.moduleId === global.currentModuleId) {
     currentInject = global.currentInject
+  } else {
+    currentInject = {
+      moduleId: global.currentModuleId
+    }
   }
   // 文件编译路径
   options.mpxFileResource = global.currentResource
@@ -18,8 +22,12 @@ export default function transferOptions (options, type, needConvert = true) {
     // 编译计算属性注入
     options.computed = Object.assign({}, currentInject.injectComputed, options.computed)
   }
+  if (currentInject && currentInject.injectMethods) {
+    // 编译methods注入
+    options.methods = Object.assign({}, currentInject.injectMethods, options.methods)
+  }
   if (currentInject && currentInject.injectOptions) {
-    // 编译option注入,优先微信中的单独配置
+    // 编译options注入,优先微信中的单独配置
     options.options = Object.assign({}, currentInject.injectOptions, options.options)
   }
   if (currentInject && currentInject.pageEvents) {

package/src/dynamic/astCache.js

@@ -0,0 +1,25 @@
+import { isFunction, isObject, error } from '@mpxjs/utils'
+
+class DynamicAstCache {
+  #astCache = {}
+
+  getAst (id) {
+    return this.#astCache[id]
+  }
+
+  setAst (id, ast) {
+    this.#astCache[id] = ast
+  }
+}
+
+export const dynamic = new DynamicAstCache()
+
+export const getAst = (__getAst, moduleId) => {
+  if ((__getAst && isFunction(__getAst))) {
+    const ast = __getAst()
+    if (!isObject(ast)) return error('__getAst returned data is not of type object')
+    return Object.values(ast)[0]
+  } else {
+    return dynamic.getAst(moduleId)
+  }
+}

package/src/dynamic/dynamicRenderMixin.js

@@ -0,0 +1,77 @@
+import { hasOwn, isObject, error } from '@mpxjs/utils'
+import genVnodeTree from './vnode/render'
+import contextMap from './vnode/context'
+import { CREATED } from '../core/innerLifecycle'
+
+function dynamicRefsMixin () {
+  return {
+    [CREATED] () {
+      // 处理ref场景，如果是在容器组件的上下文渲染
+      if (this.mpxCustomElement) {
+        this._getRuntimeRefs()
+      }
+    },
+    methods: {
+      _getRuntimeRefs () {
+        const vnodeContext = contextMap.get(this.uid)
+        if (vnodeContext) {
+          const refsArr = vnodeContext.__getRefsData && vnodeContext.__getRefsData()
+          if (Array.isArray(refsArr)) {
+            refsArr.forEach((ref) => {
+              const all = ref.all
+              if (!vnodeContext.$refs[ref.key] || (all && !vnodeContext.$refs[ref.key].length)) {
+                const refNode = this.__getRefNode(ref)
+                if ((all && refNode.length) || refNode) {
+                  Object.defineProperty(vnodeContext.$refs, ref.key, {
+                    enumerable: true,
+                    configurable: true,
+                    get: () => {
+                      return refNode
+                    }
+                  })
+                }
+              }
+            })
+          }
+        }
+      }
+    }
+  }
+}
+
+function dynamicSlotMixin () {
+  if (__mpx_mode__ === 'ali') {
+    return {
+      props: { slots: {} }
+    }
+  } else {
+    return {
+      properties: { slots: { type: Object } }
+    }
+  }
+}
+
+function dynamicRenderHelperMixin () {
+  return {
+    methods: {
+      _g (astData, moduleId) {
+        const location = this.__mpxProxy && this.__mpxProxy.options.mpxFileResource
+        if (astData && isObject(astData) && hasOwn(astData, 'template')) {
+          const vnodeTree = genVnodeTree(astData, [this], { moduleId, location })
+          return vnodeTree
+        } else {
+          error('Dynamic component get the wrong json ast data, please check.', location, {
+            errType: 'mpx-dynamic-render',
+            errmsg: 'invalid json ast data'
+          })
+        }
+      }
+    }
+  }
+}
+
+export {
+  dynamicRefsMixin,
+  dynamicSlotMixin,
+  dynamicRenderHelperMixin
+}

package/src/dynamic/vnode/context.js

@@ -0,0 +1,17 @@
+const cache = {}
+
+const contextMap = {
+  set (id, context) {
+    cache[id] = context
+  },
+  get (id) {
+    return cache[id]
+  },
+  remove (id) {
+    if (cache[id]) {
+      delete cache[id]
+    }
+  }
+}
+
+export default contextMap