@mpxjs/core 2.9.70-alpha.0 → 2.9.71

package/src/platform/export/index.js

@@ -46,4 +46,4 @@ export {
 export {
   provide,
   inject
-} from './apiInject'
+} from './inject'

package/src/platform/export/{apiInject.js → inject.js}

@@ -11,11 +11,10 @@ const providesMap = {
 global.__mpxProvidesMap = providesMap
 
 /** @internal createApp() 初始化应用层 scope provide */
-export function initAppProvides (appOptions) {
-  const provideOpt = appOptions.provide
+export function initAppProvides (provideOpt, instance) {
   if (provideOpt) {
     const provided = isFunction(provideOpt)
-      ? callWithErrorHandling(provideOpt.bind(appOptions), appOptions, 'createApp provide function')
+      ? callWithErrorHandling(provideOpt.bind(instance), instance, 'createApp provide function')
       : provideOpt
     if (isObject(provided)) {
       providesMap.__app = provided

package/src/platform/patch/builtInKeysMap.js

@@ -3,7 +3,7 @@ import { makeMap } from '@mpxjs/utils'
 
 let builtInKeys
 
-if (__mpx_mode__ === 'web' || __mpx_mode__ === 'tenon') {
+if (__mpx_mode__ === 'web') {
   builtInKeys = [
     'proto',
     'mixins',

package/src/platform/patch/getDefaultOptions.ios.js

@@ -3,7 +3,7 @@ import * as ReactNative from 'react-native'
 import { ReactiveEffect } from '../../observer/effect'
 import { watch } from '../../observer/watch'
 import { reactive, set, del } from '../../observer/reactive'
-import { hasOwn, isFunction, noop, isObject, isArray, getByPath, collectDataset, hump2dash, wrapMethodsWithErrorHandling } from '@mpxjs/utils'
+import { hasOwn, isFunction, noop, isObject, isArray, getByPath, collectDataset, hump2dash, dash2hump, callWithErrorHandling, wrapMethodsWithErrorHandling } from '@mpxjs/utils'
 import MpxProxy from '../../core/proxy'
 import { BEFOREUPDATE, ONLOAD, UPDATED, ONSHOW, ONHIDE, ONRESIZE, REACTHOOKSEXEC } from '../../core/innerLifecycle'
 import mergeOptions from '../../core/mergeOptions'
@@ -52,20 +52,18 @@ function createEffect (proxy, components) {
   proxy.effect = new ReactiveEffect(() => {
     // reset instance
     proxy.target.__resetInstance()
-    return proxy.target.__injectedRender(innerCreateElement, getComponent)
+    return callWithErrorHandling(proxy.target.__injectedRender.bind(proxy.target), proxy, 'render function', [innerCreateElement, getComponent])
   }, () => queueJob(update), proxy.scope)
   // render effect允许自触发
   proxy.toggleRecurse(true)
 }
 
-function getRootProps (props) {
+function getRootProps (props, validProps) {
   const rootProps = {}
   for (const key in props) {
-    if (hasOwn(props, key)) {
-      const match = /^(bind|catch|capture-bind|capture-catch|style|enable-var):?(.*?)(?:\.(.*))?$/.exec(key)
-      if (match) {
-        rootProps[key] = props[key]
-      }
+    const altKey = dash2hump(key)
+    if (!hasOwn(validProps, key) && !hasOwn(validProps, altKey) && key !== 'children') {
+      rootProps[key] = props[key]
     }
   }
   return rootProps
@@ -367,14 +365,10 @@ function usePageStatus (navigation, pageId) {
     const blurSubscription = navigation.addListener('blur', () => {
       pageStatusMap[pageId] = 'hide'
     })
-    const unWatchAppFocusedState = watch(global.__mpxAppFocusedState, (value) => {
-      pageStatusMap[pageId] = value
-    })
 
     return () => {
       focusSubscription()
       blurSubscription()
-      unWatchAppFocusedState()
       del(pageStatusMap, pageId)
     }
   }, [navigation])
@@ -444,10 +438,17 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
 
     useEffect(() => {
       if (type === 'page') {
-        if (!global.__mpxAppLaunched && global.__mpxAppOnLaunch) {
+        if (!global.__mpxAppHotLaunched && global.__mpxAppOnLaunch) {
           global.__mpxAppOnLaunch(props.navigation)
         }
-        proxy.callHook(ONLOAD, [props.route.params || {}])
+        const loadParams = {}
+        // 此处拿到的props.route.params内属性的value被进行过了一次decode, 不符合预期，此处额外进行一次encode来与微信对齐
+        if (isObject(props.route.params)) {
+          for (const key in props.route.params) {
+            loadParams[key] = encodeURIComponent(props.route.params[key])
+          }
+        }
+        proxy.callHook(ONLOAD, [loadParams])
       }
       proxy.mounted()
       return () => {
@@ -474,7 +475,8 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
 
     const root = useMemo(() => proxy.effect.run(), [finalMemoVersion])
     if (root && root.props.ishost) {
-      const rootProps = getRootProps(props)
+      // 对于组件未注册的属性继承到host节点上，如事件、样式和其他属性等
+      const rootProps = getRootProps(props, validProps)
       rootProps.style = Object.assign({}, root.props.style, rootProps.style)
       // update root props
       return cloneElement(root, rootProps)
@@ -560,10 +562,7 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
                 backgroundColor: pageConfig.backgroundColor || '#ffffff'
               },
               ref: rootRef,
-              onLayout,
-              onTouchStart: () => {
-                ReactNative.Keyboard.isVisible() && ReactNative.Keyboard.dismiss()
-              }
+              onLayout
             },
             createElement(RouteContext.Provider,
               {

package/src/platform/patch/getDefaultOptions.js

@@ -23,13 +23,11 @@ function transformProperties (properties) {
     } else {
       newFiled = Object.assign({}, rawFiled)
     }
-    const rawObserver = rawFiled?.observer
     newFiled.observer = function (value, oldValue) {
       if (this.__mpxProxy) {
         this[key] = value
         this.__mpxProxy.propsUpdated()
       }
-      rawObserver && rawObserver.call(this, value, oldValue)
     }
     newProps[key] = newFiled
   })

package/src/platform/patch/index.js

@@ -1,14 +1,14 @@
 import transferOptions from '../../core/transferOptions'
 import getBuiltInMixins from '../builtInMixins/index'
 import { getDefaultOptions } from './getDefaultOptions'
-import { error, isReact, isWeb, isTenon } from '@mpxjs/utils'
+import { error, isReact, isWeb } from '@mpxjs/utils'
 
 export default function createFactory (type) {
   return (options = {}, { isNative, customCtor, customCtorType } = {}) => {
     options.__nativeRender__ = !!isNative
     options.__type__ = type
     let ctor
-    if (!isWeb && !isReact && !isTenon) {
+    if (!isWeb && !isReact) {
       if (customCtor) {
         ctor = customCtor
         customCtorType = customCtorType || type
@@ -43,7 +43,7 @@ export default function createFactory (type) {
     // 将合并后的用户定义的rawOptions传入获取当前应该注入的内建mixins
     rawOptions.mixins = getBuiltInMixins({ type, rawOptions, currentInject })
     const defaultOptions = getDefaultOptions({ type, rawOptions, currentInject })
-    if (isWeb || isReact || isTenon) {
+    if (isWeb || isReact) {
       global.__mpxOptionsMap = global.__mpxOptionsMap || {}
       global.__mpxOptionsMap[currentInject.moduleId] = defaultOptions
     } else if (ctor) {

package/src/convertor/wxToTenon.js

@@ -1,86 +0,0 @@
-import * as wxLifecycle from '../platform/patch/lifecycle/index.wx'
-import * as tenonLifecycle from '../platform/patch/lifecycle/index.tenon'
-import { mergeLifecycle } from './mergeLifecycle'
-import { error, isObject, diffAndCloneA, hasOwn } from '@mpxjs/utils'
-import { implemented } from '../core/implement'
-import { CREATED, UNMOUNTED } from '../core/innerLifecycle'
-
-// 暂不支持的wx选项，后期需要各种花式支持
-const unsupported = [
-  'moved',
-  'definitionFilter',
-  'onShareAppMessage',
-  'activated',
-  'deactivated',
-  'pageShow',
-  'pageHide',
-  'onPullDownRefresh',
-  'onReachBottom',
-  'onPageScroll',
-  'onTabItemTap',
-  'onResize',
-  'onUnhandledRejection',
-  'onThemeChange'
-]
-
-function convertErrorDesc (key) {
-  error(`Options.${key} is not supported in runtime conversion from wx to tenon.`, global.currentResource)
-}
-
-function notSupportTip (options) {
-  unsupported.forEach(key => {
-    if (options[key]) {
-      if (!implemented[key]) {
-        process.env.NODE_ENV !== 'production' && convertErrorDesc(key)
-        delete options[key]
-      } else if (implemented[key].remove) {
-        delete options[key]
-      }
-    }
-  })
-}
-
-export default {
-  lifecycle: mergeLifecycle(wxLifecycle.LIFECYCLE),
-  lifecycle2: mergeLifecycle(tenonLifecycle.LIFECYCLE),
-  pageMode: 'blend',
-  // support传递为true以将methods外层的方法函数合入methods中
-  support: true,
-  // wx输出tenon时额外将onLoad代理到CREATED
-  lifecycleProxyMap: Object.assign({}, wxLifecycle.lifecycleProxyMap, {
-    [CREATED]: ['created', 'attached', 'onLoad'],
-    [UNMOUNTED]: ['destroyed', 'detached', 'onUnload', 'unmounted']
-  }),
-  convert (options) {
-    const props = Object.assign({}, options.properties, options.props)
-    if (props) {
-      Object.keys(props).forEach(key => {
-        const prop = props[key]
-        if (prop) {
-          if (hasOwn(prop, 'type')) {
-            const newProp = {}
-            if (hasOwn(prop, 'optionalTypes')) {
-              newProp.type = [prop.type, ...prop.optionalTypes]
-            } else {
-              newProp.type = prop.type
-            }
-            if (hasOwn(prop, 'value')) {
-              // vue中对于引用类型数据需要使用函数返回
-              newProp.default = isObject(prop.value)
-                ? function propFn () {
-                  return diffAndCloneA(prop.value).clone
-                }
-                : prop.value
-            }
-            props[key] = newProp
-          } else {
-            props[key] = prop
-          }
-        }
-      })
-      options.props = props
-      delete options.properties
-    }
-    notSupportTip(options)
-  }
-}

package/src/external/vue.js

@@ -1 +0,0 @@
-export default {}

package/src/external/vue.tenon.js

@@ -1,13 +0,0 @@
-import {
-  reactive,
-  computed,
-  toRaw,
-  watch
-} from '@hummer/tenon-vue'
-
-export default {
-  reactive,
-  computed,
-  toRaw,
-  watch
-}

package/src/external/vue.web.js

@@ -1,6 +0,0 @@
-import Vue from 'vue'
-import install from './vuePlugin'
-
-Vue.use(install)
-
-export default Vue

package/src/platform/builtInMixins/pageStatusMixin.tenon.js

@@ -1,40 +0,0 @@
-import { CREATED, ONSHOW, ONHIDE } from '../../core/innerLifecycle'
-
-export default function pageStatusMixin (mixinType) {
-  if (mixinType === 'page') {
-    return {
-      data: {
-        mpxPageStatus: 'show'
-      },
-      onShow () {
-        this.mpxPageStatus = 'show'
-        this.__mpxProxy.callHook(ONSHOW)
-      },
-      onHide () {
-        this.mpxPageStatus = 'hide'
-        this.__mpxProxy.callHook(ONHIDE)
-      },
-      onBack () {
-        return this.onBack && this.onBack()
-      }
-    }
-  }
-  // components
-  return {
-    [CREATED] () {
-      const pageInstance = global.__currentPageInstance
-      if (!pageInstance) return
-      this.$watch(
-        () => pageInstance.mpxPageStatus,
-        status => {
-          if (!status) return
-          const pageLifetimes = (this.$rawOptions && this.$rawOptions.pageLifetimes) || {}
-          // show & hide
-          if (status in pageLifetimes && typeof pageLifetimes[status] === 'function') {
-            pageLifetimes[status].call(this)
-          }
-        }
-      )
-    }
-  }
-}

package/src/platform/builtInMixins/proxyEventMixin.tenon.js

@@ -1,46 +0,0 @@
-import { setByPath } from '@mpxjs/utils'
-
-export default function proxyEventMixin () {
-  const methods = {
-    triggerEvent (eventName, eventDetail) {
-      return this.$emit(eventName, {
-        type: eventName,
-        detail: eventDetail
-      })
-    },
-    __model (expr, $event, valuePath = ['value'], filterMethod) {
-      const innerFilter = {
-        trim: val => typeof val === 'string' && val.trim()
-      }
-      const originValue = valuePath.reduce((acc, cur) => acc[cur], $event.detail)
-      const value = filterMethod ? (innerFilter[filterMethod] ? innerFilter[filterMethod](originValue) : typeof this[filterMethod] === 'function' && this[filterMethod]) : originValue
-      setByPath(this, expr, value)
-    },
-    getOpenerEventChannel () {
-      const router = global.__mpxRouter
-      const eventChannel = router && router.__mpxAction && router.__mpxAction.eventChannel
-      return eventChannel
-    }
-  }
-
-  return {
-    beforeCreate () {
-      const modelEvent = this.$attrs.mpxModelEvent
-      const modelEventId = this.$attrs.mpxModelEventId
-      if (modelEvent && modelEventId) {
-        Hummer.notifyCenter.addEventListener(modelEventId, (e) => {
-          this.$emit('mpxModel', e)
-        })
-      }
-    },
-    beforeDestroy () {
-      const modelEvent = this.$attrs.mpxModelEvent
-      const modelEventId = this.$attrs.mpxModelEventId
-      if (modelEvent && modelEventId) {
-        Hummer.notifyCenter.removeEventListener(modelEventId)
-      }
-    },
-
-    methods
-  }
-}

package/src/platform/export/apiInject.tenon.js

@@ -1 +0,0 @@
-export { provide, inject } from '@hummer/tenon-vue'

package/src/platform/export/index.tenon.js

@@ -1,78 +0,0 @@
-import {
-  effectScope as vueEffectScope,
-  getCurrentScope as getCurrentVueScope,
-  onScopeDispose
-} from '@hummer/tenon-vue'
-
-import {
-  hasOwn,
-  isValidArrayIndex
-} from '@mpxjs/utils'
-
-export {
-  // watch
-  watchEffect,
-  watchSyncEffect,
-  watchPostEffect,
-  watch,
-  // reactive
-  reactive,
-  isReactive,
-  shallowReactive,
-  markRaw,
-  // ref
-  ref,
-  unref,
-  toRef,
-  toRefs,
-  isRef,
-  customRef,
-  shallowRef,
-  triggerRef,
-  // computed
-  computed,
-  // instance
-  getCurrentInstance,
-  provide,
-  inject
-} from '@hummer/tenon-vue'
-
-export function set (target, key, val) {
-  if (Array.isArray(target) && isValidArrayIndex(key)) {
-    target.length = Math.max(target.length, key)
-    target.splice(key, 1, val)
-    return val
-  }
-  target[key] = val
-  return val
-}
-
-export function del (target, key) {
-  if (Array.isArray(target) && isValidArrayIndex(key)) {
-    target.splice(key, 1)
-    return
-  }
-  if (!hasOwn(target, key)) {
-    return
-  }
-  delete target[key]
-}
-
-const noop = () => {
-}
-
-const fixEffectScope = (scope) => {
-  scope.pause = noop
-  scope.resume = noop
-  return scope
-}
-
-const effectScope = (detached) => fixEffectScope(vueEffectScope(detached))
-const getCurrentScope = () => fixEffectScope(getCurrentVueScope())
-
-export {
-  // effectScope
-  effectScope,
-  getCurrentScope,
-  onScopeDispose
-}

package/src/platform/patch/getDefaultOptions.tenon.js

@@ -1,99 +0,0 @@
-import builtInKeysMap from './builtInKeysMap'
-import mergeOptions from '../../core/mergeOptions'
-import { getCurrentInstance as getCurrentVueInstance } from '../export/index'
-import MpxProxy, { setCurrentInstance, unsetCurrentInstance } from '../../core/proxy'
-import { diffAndCloneA, warn, wrapMethodsWithErrorHandling } from '@mpxjs/utils'
-import { UPDATED, CREATED, MOUNTED, UNMOUNTED } from '../../core/innerLifecycle'
-
-function filterOptions (options) {
-  const newOptions = {}
-  Object.keys(options).forEach(key => {
-    if (builtInKeysMap[key]) {
-      return
-    }
-    if (key === 'data' || key === 'dataFn') {
-      newOptions.data = function mergeFn () {
-        return Object.assign(
-          diffAndCloneA(options.data || {}).clone,
-          options.dataFn && options.dataFn.call(this)
-        )
-      }
-    } else if (key === 'methods') {
-      newOptions[key] = wrapMethodsWithErrorHandling(options[key])
-    } else {
-      newOptions[key] = options[key]
-    }
-  })
-  return newOptions
-}
-
-function initProxy (context, rawOptions) {
-  if (!context.__mpxProxy) {
-    // 缓存options
-    context.$rawOptions = rawOptions
-    // 创建proxy对象
-    context.__mpxProxy = new MpxProxy(rawOptions, context)
-    // todo 待问题修复后需要还原
-    // context.__mpxProxy.callHook(CREATED, Hummer.pageInfo && Hummer.pageInfo.params && [Hummer.pageInfo.params])
-  }
-}
-
-export function getDefaultOptions ({type, rawOptions = {}, currentInject }) {
-  const rawSetup = rawOptions.setup
-  if (rawSetup) {
-    rawOptions.setup = (props) => {
-      const { proxy: instance } = getCurrentVueInstance()
-      initProxy(instance, rawOptions)
-      setCurrentInstance(instance.__mpxProxy)
-      const newContext = {
-        triggerEvent: (eventName, eventDetail) => {
-          return instance.$emit(eventName, {
-            type: eventName,
-            detail: eventDetail
-          })
-        },
-        get refs () { return instance.$refs },
-        forceUpdate: instance.$forceUpdate.bind(instance),
-        selectComponent: () => {
-          warn('selectComponent is not supported in Tenon')
-        },
-        selectAllComponents: () => {
-          warn('selectAllComponents is not supported in Tenon')
-        },
-        createSelectorQuery: () => {
-          warn('createSelectorQuery is not supported in Tenon')
-        },
-        createIntersectionObserver: () => {
-          warn('createIntersectionObserver is not supported in Tenon')
-        }
-      }
-      const setupRes = rawSetup(props, newContext)
-      unsetCurrentInstance(instance.__mpxProxy)
-      return setupRes
-    }
-  }
-
-  const hookNames = type === 'page' ? ['onLoad', 'onReady', 'onUnload'] : ['created', 'mounted', 'unmounted']
-  const rootMixins = [{
-    [hookNames[0]] (...params) {
-      if (!this.__mpxProxy) {
-        initProxy(this, rawOptions, currentInject, params)
-      }
-      // todo 待问题修复后需要移除，目前逻辑是已经创建实例的情况下依旧会重复执行
-      this.__mpxProxy.callHook(CREATED, Hummer.pageInfo && Hummer.pageInfo.params && [Hummer.pageInfo.params])
-    },
-    [hookNames[1]] () {
-      this.__mpxProxy && this.__mpxProxy.callHook(MOUNTED, Hummer.pageInfo && Hummer.pageInfo.params && [Hummer.pageInfo.params])
-    },
-    updated () {
-      this.__mpxProxy && this.__mpxProxy.callHook(UPDATED)
-    },
-    [hookNames[2]] () {
-      this.__mpxProxy && this.__mpxProxy.callHook(UNMOUNTED)
-    }
-  }]
-  // 为了在builtMixin中可以使用某些rootMixin实现的特性（如数据响应等），此处builtInMixin在rootMixin之后执行，但是当builtInMixin使用存在对应内建生命周期的目标平台声明周期写法时，可能会出现用户生命周期比builtInMixin中的生命周期先执行的情况，为了避免这种情况发生，builtInMixin应该尽可能使用内建生命周期来编写
-  rawOptions.mixins = rawOptions.mixins ? rootMixins.concat(rawOptions.mixins) : rootMixins
-  rawOptions = mergeOptions(rawOptions, type, false)
-  return filterOptions(rawOptions)
-}

package/src/platform/patch/lifecycle/index.tenon.js

@@ -1,52 +0,0 @@
-const COMPONENT_HOOKS = [
-  'beforeCreate',
-  'created',
-  'beforeMount',
-  'mounted',
-  'beforeUpdate',
-  'updated',
-  // 'activated',
-  // 'deactivated',
-  'beforeDestroy',
-  'destroyed',
-  'errorCaptured',
-  'beforeUnmount',
-  'unmounted'
-  // 'onPageNotFound'
-]
-
-const PAGE_HOOKS = [
-  ...COMPONENT_HOOKS,
-  'onLoad',
-  'onReady',
-  'onShow',
-  'onHide',
-  'onUnload'
-  // 'onBack',
-  // 'onPullDownRefresh',
-  // 'onReachBottom',
-  // 'onPageScroll',
-  // 'onTabItemTap',
-  // 'onResize'
-]
-
-const APP_HOOKS = [
-  ...COMPONENT_HOOKS,
-  'onLaunch',
-  'onShow',
-  'onHide',
-  'onError'
-  // 'onPageNotFound',
-  // 'onUnhandledRejection',
-  // 'onThemeChange'
-]
-
-export const LIFECYCLE = {
-  APP_HOOKS,
-  PAGE_HOOKS,
-  COMPONENT_HOOKS
-}
-
-export const pageMode = ''
-
-export const lifecycleProxyMap = {}