@mpxjs/core 2.6.104 → 2.6.114-alpha.0

package/@types/global.d.ts

@@ -1,5 +1,5 @@
 // declaration for mpx mode
-declare let __mpx_mode__: 'wx' | 'ali' | 'swan' | 'qq' | 'tt' | 'web' | 'dd' | 'qa' | 'jd'
+declare let __mpx_mode__: 'wx' | 'ali' | 'swan' | 'qq' | 'tt' | 'dd' | 'qa' | 'jd' | 'web' | 'tenon'
 
 // declaration for mpx env
 declare let __mpx_env__: string

package/@types/index.d.ts

@@ -44,6 +44,10 @@ type UnionToIntersection<U> = (U extends any
   ? I
   : never;
 
+type RemoveNeverProps<T> = Pick<T, {
+  [K in keyof T]: T[K] extends never ? never : K
+}[keyof T]>
+
 type ArrayType<T extends any[]> = T extends Array<infer R> ? R : never;
 
 // Mpx types
@@ -288,8 +292,31 @@ type MixinType = 'app' | 'page' | 'component'
 
 export function injectMixins (mixins: object | Array<object>, options?: MixinType | MixinType[] | { types?: MixinType | MixinType[], stage?: number }): void
 
+declare class Watcher {
+  constructor (context: any, expr: string | (() => any), handler: WatchHandler | WatchOptWithHandler, options?: WatchOpt)
+
+  getValue (): any
+
+  update (): void
+
+  run (): void
+
+  destroy (): void
+}
+
 export function watch (expr: string | (() => any), handler: WatchHandler | WatchOptWithHandler, options?: WatchOpt): () => void
 
+type SupportedPlantforms = 'wx' | 'ali' | 'qq' | 'tt' | 'swan'
+
+interface ConvertRule {
+  lifecycle?: object
+  lifecycleTemplate?: SupportedPlantforms
+  lifecycleProxyMap?: object
+  pageMode?: 'blend' | ''
+  support?: boolean
+  convert?: (...args: any[]) => any
+}
+
 interface AnyConstructor {
   new (...args: any[]): any
 
@@ -297,14 +324,15 @@ interface AnyConstructor {
 }
 
 interface MpxConfig {
-  useStrictDiff: boolean
-  ignoreWarning: boolean | string | RegExp | ((msg: string, location: string, e: Error) => boolean)
+  useStrictDiff: Boolean
+  ignoreRenderError: Boolean
   ignoreConflictWhiteList: Array<string>
-  observeClassInstance: boolean | Array<AnyConstructor>
+  observeClassInstance: Boolean | Array<AnyConstructor>
   hookErrorHandler: (e: Error, target: ComponentIns<{}, {}, {}, {}, []>, hookName: string) => any | null
   proxyEventHandler: (e: Event) => any | null
   setDataHandler: (data: object, target: ComponentIns<{}, {}, {}, {}, []>) => any | null
-  forceRunWatcherSync: boolean
+  forceRunWatcherSync: boolean,
+  webRouteConfig: object
 }
 
 type SupportedMode = 'wx' | 'ali' | 'qq' | 'swan' | 'tt' | 'web' | 'qa'
@@ -312,7 +340,7 @@ type SupportedMode = 'wx' | 'ali' | 'qq' | 'swan' | 'tt' | 'web' | 'qa'
 interface ImplementOptions {
   modes?: Array<SupportedMode>
   processor?: () => any
-  remove?: boolean
+  remove?: Boolean
 }
 
 export function toPureObject<T extends object> (obj: T): T

package/@types/mpx-store.d.ts

@@ -129,8 +129,10 @@ declare namespace MpxStore {
 
   /**
    * remove compatible code in Mpx.
+   * 
    * if you need using createStoreWithThis mix with createStore
    * you can add a global define file
+   * 
    * use Declaration Merging(https://www.typescriptlang.org/docs/handbook/declaration-merging.html) on CompatibleDispatch:
    * @example
    * declare module MpxStore {

package/@types/node.d.ts

@@ -1,4 +1,3 @@
-// @ts-ignore
 declare let global: Record<string, any> // in web, we use global varible to do some things, here to declare
 
 type Dict<T> = {
@@ -7,7 +6,6 @@ type Dict<T> = {
 
 type EnvType = Dict<string>
 
-// @ts-ignore
 declare let process: {
   env: EnvType
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.6.104",
+  "version": "2.6.114-alpha.0",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -17,11 +17,14 @@
     "src",
     "@types"
   ],
+  "main": "src/index.js",
   "dependencies": {
     "lodash": "^4.1.1",
     "miniprogram-api-typings": "^3.0.2"
   },
   "peerDependencies": {
+    "@hummer/tenon-store": "^1.4.0",
+    "@hummer/tenon-vue": "^1.5.1",
     "vue": "^2.6.10",
     "vue-i18n": "^8.15.3"
   },
@@ -40,5 +43,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "3823f982d03b0f58abbac3bc8cbbd73b85ac9ed8"
+  "gitHead": "7f944d9d7fe0dd3bd0a798c6268c6d08f90d62c0"
 }

package/src/convertor/convertor.js

@@ -1,11 +1,13 @@
 import * as wxLifecycle from '../platform/patch/wx/lifecycle'
 import * as aliLifecycle from '../platform/patch/ali/lifecycle'
 import * as webLifecycle from '../platform/patch/web/lifecycle'
+import * as tenonLifecycle from '../platform/patch/tenon/lifecycle'
 import * as swanLifecycle from '../platform/patch/swan/lifecycle'
 import { mergeLifecycle } from './mergeLifecycle'
 import { error } from '../helper/log'
 import wxToAliRule from './wxToAli'
 import wxToWebRule from './wxToWeb'
+import wxToTenonRule from './wxToTenon'
 import wxToSwanRule from './wxToSwan'
 import wxToQqRule from './wxToQq'
 import wxToTtRule from './wxToTt'
@@ -19,6 +21,9 @@ let pageMode
 if (__mpx_mode__ === 'web') {
   lifecycleInfo = webLifecycle
   pageMode = ''
+} else if (__mpx_mode__ === 'tenon') {
+  lifecycleInfo = tenonLifecycle
+  pageMode = ''
 } else if (__mpx_mode__ === 'ali') {
   lifecycleInfo = aliLifecycle
   pageMode = ''
@@ -50,6 +55,7 @@ const rulesMap = {
   local: { ...defaultConvertRule },
   default: defaultConvertRule,
   wxToWeb: wxToWebRule,
+  wxToTenon: wxToTenonRule,
   wxToAli: wxToAliRule,
   wxToSwan: wxToSwanRule,
   wxToQq: { ...defaultConvertRule, ...wxToQqRule },

package/src/convertor/getConvertMode.js

@@ -1,6 +1,7 @@
 const convertModes = {
   'wx-ali': 'wxToAli',
   'wx-web': 'wxToWeb',
+  'wx-tenon': 'wxToTenon',
   'wx-swan': 'wxToSwan',
   'wx-qq': 'wxToQq',
   'wx-tt': 'wxToTt',

package/src/convertor/wxToAli.js

@@ -5,6 +5,7 @@ import { mergeToArray } from '../core/mergeOptions'
 import { error } from '../helper/log'
 import { implemented } from '../core/implement'
 import { hasOwn } from '../helper/utils'
+import { CREATED } from '../core/innerLifecycle'
 
 const unsupported = ['moved', 'definitionFilter']
 
@@ -43,7 +44,10 @@ export default {
   lifecycle2: mergeLifecycle(aliLifecycle.LIFECYCLE),
   pageMode: 'blend',
   support: false,
-  lifecycleProxyMap: wxLifecycle.lifecycleProxyMap,
+  // wx输出ali时额外将onLoad代理到CREATED
+  lifecycleProxyMap: Object.assign({}, wxLifecycle.lifecycleProxyMap, {
+    [CREATED]: ['created', 'attached', 'onLoad']
+  }),
   convert (options) {
     const props = Object.assign({}, options.properties, options.props)
     if (props) {

package/src/convertor/wxToSwan.js

@@ -1,5 +1,6 @@
 import { error } from '../helper/log'
 import { implemented } from '../core/implement'
+import { CREATED } from '../core/innerLifecycle'
 import { mergeLifecycle } from './mergeLifecycle'
 import * as wxLifecycle from '../platform/patch/wx/lifecycle'
 import * as swanLifecycle from '../platform/patch/swan/lifecycle'
@@ -33,7 +34,10 @@ export default {
   lifecycle2: mergeLifecycle(swanLifecycle.LIFECYCLE),
   pageMode: 'blend',
   support: true,
-  lifecycleProxyMap: wxLifecycle.lifecycleProxyMap,
+  // wx输出swan时额外将onLoad代理到CREATED
+  lifecycleProxyMap: Object.assign({}, wxLifecycle.lifecycleProxyMap, {
+    [CREATED]: ['created', 'attached', 'onLoad']
+  }),
   convert (options, type) {
     if (options.behaviors) {
       options.behaviors.forEach((behavior, idx) => {

package/src/convertor/wxToTenon.js

@@ -0,0 +1,84 @@
+import * as wxLifecycle from '../platform/patch/wx/lifecycle'
+import * as tenonLifecycle from '../platform/patch/tenon/lifecycle'
+import { mergeLifecycle } from './mergeLifecycle'
+import { error } from '../helper/log'
+import { isObject, diffAndCloneA, hasOwn } from '../helper/utils'
+import { implemented } from '../core/implement'
+import { CREATED } 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']
+  }),
+  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/convertor/wxToWeb.js

@@ -4,6 +4,7 @@ import { mergeLifecycle } from './mergeLifecycle'
 import { error } from '../helper/log'
 import { isObject, diffAndCloneA, hasOwn } from '../helper/utils'
 import { implemented } from '../core/implement'
+import { CREATED } from '../core/innerLifecycle'
 
 // 暂不支持的wx选项，后期需要各种花式支持
 const unsupported = ['moved', 'definitionFilter', 'onShareAppMessage', 'pageShow', 'pageHide']
@@ -29,8 +30,12 @@ export default {
   lifecycle: mergeLifecycle(wxLifecycle.LIFECYCLE),
   lifecycle2: mergeLifecycle(webLifecycle.LIFECYCLE),
   pageMode: 'blend',
+  // support传递为true以将methods外层的方法函数合入methods中
   support: true,
-  lifecycleProxyMap: wxLifecycle.lifecycleProxyMap,
+  // wx输出web时额外将onLoad代理到CREATED
+  lifecycleProxyMap: Object.assign({}, wxLifecycle.lifecycleProxyMap, {
+    [CREATED]: ['created', 'attached', 'onLoad']
+  }),
   convert (options) {
     const props = Object.assign({}, options.properties, options.props)
     if (props) {

package/src/core/createStore.js

@@ -4,6 +4,8 @@ import { initComputed } from '../observer/computed'
 
 import Vue from '../vue'
 
+import createHummerPlugin from '../platform/builtInPlugins/hummerStorePlugin'
+
 import {
   proxy,
   getByPath
@@ -124,6 +126,12 @@ class Store {
     this.state = this.registerModule(options).state
     this.resetStoreVM()
     Object.assign(this, mapStore(this))
+    if (__mpx_mode__ === 'tenon') {
+      plugins.push(createHummerPlugin({
+        /* eslint-disable camelcase */
+        store_key: `MPX_STORE${options.__store_id}`
+      }))
+    }
     plugins.forEach(plugin => plugin(this))
   }
 
@@ -152,9 +160,9 @@ class Store {
 
   registerModule (module) {
     const state = module.state || {}
-    const reactiveModule = {
-      state
-    }
+    const reactiveModule = __mpx_mode__ === 'tenon'
+      ? Vue.reactive({ state })
+      : { state }
     if (module.getters) {
       reactiveModule.getters = transformGetters(module.getters, reactiveModule, this)
     }
@@ -194,6 +202,16 @@ class Store {
       const computedKeys = Object.keys(this.__wrappedGetters)
       proxy(this.getters, this._vm, computedKeys)
       proxy(this.getters, this.__depsGetters)
+    } else if (__mpx_mode__ === 'tenon') {
+      const computedObj = {}
+      Object.keys(this.__wrappedGetters).forEach(k => {
+        const getter = this.__wrappedGetters[k]
+        computedObj[k] = () => getter(this.state)
+        Object.defineProperty(this.getters, k, {
+          get: () => Vue.computed(() => computedObj[k]()).value,
+          enumerable: true // for local getters
+        })
+      })
     } else {
       this._vm = {}
       observe(this.state, true)
@@ -201,6 +219,17 @@ class Store {
       proxy(this.getters, this.__depsGetters)
     }
   }
+  /**
+   * 替换state，tenon环境中使用
+   */
+  replaceState (state) {
+    // todo 某些key可能无法删除
+    Object.assign(this.state, state)
+    // this.resetStoreVM()
+  }
+  _withCommit (fn) {
+    fn()
+  }
 }
 
 function genericSubscribe (fn, subs, options) {

package/src/core/proxy.js

@@ -45,7 +45,7 @@ export default class MPXProxy {
     this.state = 'initial'
     this.lockTask = asyncLock()
     this.ignoreProxyMap = makeMap(EXPORT_MPX.config.ignoreProxyWhiteList)
-    if (__mpx_mode__ !== 'web') {
+    if (__mpx_mode__ !== 'web' && __mpx_mode__ !== 'tenon') {
       this._watchers = []
       this._watcher = null
       this.localKeysMap = {} // 非props key
@@ -60,12 +60,12 @@ export default class MPXProxy {
   created (params) {
     this.initApi()
     this.callUserHook(BEFORECREATE)
-    if (__mpx_mode__ !== 'web') {
+    if (__mpx_mode__ !== 'web' && __mpx_mode__ !== 'tenon') {
       this.initState(this.options)
     }
     this.state = CREATED
     this.callUserHook(CREATED, params)
-    if (__mpx_mode__ !== 'web') {
+    if (__mpx_mode__ !== 'web' && __mpx_mode__ !== 'tenon') {
       // 强制走小程序原生渲染逻辑
       this.options.__nativeRender__ ? this.doRender() : this.initRender()
     }
@@ -111,7 +111,7 @@ export default class MPXProxy {
 
   destroyed () {
     this.state = DESTROYED
-    if (__mpx_mode__ !== 'web') {
+    if (__mpx_mode__ !== 'web' && __mpx_mode__ !== 'tenon') {
       this.clearWatchers()
     }
     this.callUserHook(DESTROYED)
@@ -136,7 +136,7 @@ export default class MPXProxy {
         error(`The key [${key}] of page options exist in the page instance already, please check your page options!`, this.options.mpxFileResource)
       })
     }
-    if (__mpx_mode__ !== 'web') {
+    if (__mpx_mode__ !== 'web' && __mpx_mode__ !== 'tenon') {
       // 挂载$watch
       this.target.$watch = (...rest) => this.watch(...rest)
       // 强制执行render
@@ -241,7 +241,9 @@ export default class MPXProxy {
         if (typeof EXPORT_MPX.config.hookErrorHandler === 'function') {
           EXPORT_MPX.config.hookErrorHandler(e, this.target, hookName)
         } else {
-          error(`User hook [${hookName}] exec error!`, this.options.mpxFileResource, e)
+          setTimeout(() => {
+            throw e
+          })
         }
       }
     }
@@ -413,7 +415,9 @@ export default class MPXProxy {
         try {
           return this.target.__injectedRender()
         } catch (e) {
-          warn(`Failed to execute render function, degrade to full-set-data mode.`, this.options.mpxFileResource, e)
+          if (!EXPORT_MPX.config.ignoreRenderError) {
+            warn(`Failed to execute render function, degrade to full-set-data mode.`, this.options.mpxFileResource, e)
+          }
           this.render()
         }
       }, noop)
@@ -442,7 +446,7 @@ export default class MPXProxy {
       this.forceUpdateData = data
       Object.keys(this.forceUpdateData).forEach(key => {
         if (!this.options.__nativeRender__ && !this.localKeysMap[getFirstKey(key)]) {
-          warn(`ForceUpdate data includes a props/computed key [${key}], which may yield a unexpected result.`, this.options.mpxFileResource)
+          warn(`ForceUpdate data includes a props/computed key [${key}], which may yield a unexpected result!`, this.options.mpxFileResource)
         }
         setByPath(this.data, key, this.forceUpdateData[key])
       })

package/src/core/transferOptions.js

@@ -32,7 +32,7 @@ export default function transferOptions (options, type) {
     // 头条和百度小程序由于props传递为异步操作，通过props向子组件传递computed数据时，子组件无法在初始时(created/attached)获取到computed数据，如需进一步处理数据建议通过watch获取
     currentInject.propKeys.forEach(key => {
       if (findItem(computedKeys, key)) {
-        warn(`由于平台机制原因，子组件无法在初始时(created/attached)获取到通过props传递的计算属性[${key}]，该问题一般不影响渲染，如需进一步处理数据建议通过watch获取。`, global.currentResource)
+        warn(`The child component can't achieve the value of computed prop [${key}] when attached, which is governed by the order of tt miniprogram's lifecycles.`, global.currentResource)
       }
     })
   }

package/src/helper/MpxScroll/index.js

@@ -1,3 +1,4 @@
+import { error } from '../../helper/log'
 import { getOffsetTop, getElement, getScrollTop, preventDefault } from './dom'
 import EventEmitter from './EventEmitter'
 import EventRegister from './EventRegister'
@@ -210,7 +211,7 @@ export default class MpxScroll {
     } else if (isDef(selector)) {
       _scrollTop = getOffsetTop(getElement(selector))
     } else {
-      return console.error('[pageScrollTo error]: scrollTop and selector are not defined')
+      return error('[pageScrollTo error]: scrollTop and selector are not defined')
     }
 
     if (duration === 0) {

package/src/helper/log.js

@@ -1,18 +1,5 @@
-import EXPORT_MPX from '../index'
-
 export function warn (msg, location, e) {
-  const condition = EXPORT_MPX.config.ignoreWarning
-  let ignore = false
-  if (typeof condition === 'boolean') {
-    ignore = condition
-  } else if (typeof condition === 'string') {
-    ignore = msg.indexOf(condition) !== -1
-  } else if (typeof condition === 'function') {
-    ignore = condition(msg, location, e)
-  } else if (condition instanceof RegExp) {
-    ignore = condition.test(msg)
-  }
-  if (!ignore) return log('warn', msg, location, e)
+  return log('warn', msg, location, e)
 }
 
 export function error (msg, location, e) {

package/src/index.js

@@ -133,6 +133,30 @@ if (__mpx_mode__ === 'web') {
   InstanceAPIs = {
     $remove: remove
   }
+} else if (__mpx_mode__ === 'tenon') {
+  const set = (target, key, value) => {
+    return Reflect.set(target, key, value)
+  }
+  const del = (target, key) => {
+    return Reflect.deleteProperty(target, key)
+  }
+  APIs = {
+    createApp,
+    createPage,
+    createComponent,
+    createStore,
+    createStoreWithThis,
+    mixin: injectMixins,
+    injectMixins,
+    toPureObject: Vue.toRaw,
+    observable: Vue.reactive,
+    watch: Vue.watch,
+    use,
+    set,
+    delete: del,
+    getMixin,
+    implement
+  }
 } else {
   observable = function (obj) {
     observe(obj)
@@ -199,18 +223,19 @@ const EXPORT_MPX = factory()
 
 EXPORT_MPX.config = {
   useStrictDiff: false,
-  ignoreWarning: false,
+  ignoreRenderError: false,
   ignoreProxyWhiteList: ['id', 'dataset', 'data'],
   observeClassInstance: false,
   hookErrorHandler: null,
   proxyEventHandler: null,
   setDataHandler: null,
-  forceRunWatcherSync: false
+  forceRunWatcherSync: false,
+  webRouteConfig: {}
 }
 
-if (__mpx_mode__ === 'web') {
-  global.__mpx = EXPORT_MPX
-} else {
+global.__mpx = EXPORT_MPX
+
+if (__mpx_mode__ !== 'web') {
   if (global.i18n) {
     observe(global.i18n)
     // 挂载翻译方法

package/src/platform/builtInMixins/index.js

@@ -26,6 +26,11 @@ export default function getBuiltInMixins (options, type) {
       // 由于relation可能是通过mixin注入的，不能通过当前的用户options中是否存在relations来简单判断是否注入该项mixin
       relationsMixin(type)
     ]
+  } else if (__mpx_mode__ === 'tenon') {
+    bulitInMixins = [
+      proxyEventMixin(),
+      pageStatusMixin(type)
+    ]
   } else {
     // 此为差异抹平类mixins，原生模式下也需要注入也抹平平台差异
     bulitInMixins = [

package/src/platform/builtInMixins/pageRouteMixin.js

@@ -3,9 +3,7 @@ export default function pageRouteMixin (mixinType) {
   if (mixinType === 'page') {
     return {
       beforeCreate () {
-        if (this.$options.__mpxPageRoute) {
-          this.route = this.$options.__mpxPageRoute.slice(1)
-        }
+        this.route = this.$options.__mpxPageRoute || ''
       }
     }
   }

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

@@ -0,0 +1,35 @@
+import { CREATED } from '../../core/innerLifecycle'
+
+export default function pageStatusMixin (mixinType) {
+  if (mixinType === 'page') {
+    return {
+      data: {
+        mpxPageStatus: 'show'
+      },
+      onShow () {
+        this.mpxPageStatus = 'show'
+      },
+      onHide () {
+        this.mpxPageStatus = 'hide'
+      }
+    }
+  }
+  // components
+  return {
+    [CREATED] () {
+      let 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.js

@@ -20,6 +20,8 @@ export default function proxyEventMixin () {
       if (type === 'begin' || type === 'end') {
         // 地图的 regionchange 事件会派发 e.type 为 begin 和 end 的事件
         fallbackType = 'regionchange'
+      } else if (__mpx_mode__ === 'ali') {
+        fallbackType = type.replace(/^./, i => i.toLowerCase())
       }
       const target = $event.currentTarget || $event.target
       if (!target) {

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

@@ -0,0 +1,37 @@
+import { setByPath } from '../../helper/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
+      if (modelEvent) {
+        this.$on(modelEvent, (e) => {
+          this.$emit('mpxModel', e)
+        })
+      }
+    },
+    methods
+  }
+}

package/src/platform/builtInPlugins/hummerStorePlugin.js

@@ -0,0 +1 @@
+export default () => () => {} // mock plugin in other mode

package/src/platform/builtInPlugins/hummerStorePlugin.tenon.js

@@ -0,0 +1,3 @@
+import { createHummerPlugin } from '@hummer/tenon-store'
+
+export default createHummerPlugin

package/src/platform/createApp.js

@@ -3,6 +3,7 @@ import mergeOptions from '../core/mergeOptions'
 import builtInKeysMap from './patch/builtInKeysMap'
 import { makeMap, spreadProp } from '../helper/utils'
 import * as webLifecycle from '../platform/patch/web/lifecycle'
+import EXPORT_MPX from '../index'
 
 const webAppHooksMap = makeMap(webLifecycle.LIFECYCLE.APP_HOOKS)
 
@@ -22,7 +23,12 @@ function filterOptions (options, appData) {
 }
 
 export default function createApp (option, config = {}) {
-  const builtInMixins = []
+  // 在App中挂载mpx对象供周边工具访问，如e2e测试
+  const builtInMixins = [{
+    getMpx () {
+      return EXPORT_MPX
+    }
+  }]
   const appData = {}
   if (__mpx_mode__ === 'web') {
     builtInMixins.push({
@@ -55,6 +61,13 @@ export default function createApp (option, config = {}) {
         }
       }
     })
+  } else if (__mpx_mode__ === 'tenon') {
+    // todo add tenon mixins
+    builtInMixins.push({
+      onLaunch () {
+        // console.log('tenon mixins')
+      }
+    })
   } else {
     builtInMixins.push({
       onLaunch () {
@@ -66,7 +79,7 @@ export default function createApp (option, config = {}) {
   rawOptions.mixins = builtInMixins
   const defaultOptions = filterOptions(spreadProp(mergeOptions(rawOptions, 'app', false), 'methods'), appData)
 
-  if (__mpx_mode__ === 'web') {
+  if (__mpx_mode__ === 'web' || __mpx_mode__ === 'tenon') {
     global.currentOption = defaultOptions
     global.getApp = function () {
       return appData

package/src/platform/patch/ali/lifecycle.js

@@ -39,7 +39,7 @@ const COMPONENT_HOOKS = [
 
 export const lifecycleProxyMap = {
   [BEFORECREATE]: ['beforeCreate'],
-  [CREATED]: ['onInit'],
+  [CREATED]: ['onInit', 'onLoad'],
   [UPDATED]: ['didUpdate', 'updated'],
   [BEFOREMOUNT]: ['beforeMount'],
   [MOUNTED]: ['didMount', 'onReady'],

package/src/platform/patch/builtInKeysMap.js

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

package/src/platform/patch/index.js

@@ -4,6 +4,7 @@ import { getDefaultOptions as getWxDefaultOptions } from './wx/getDefaultOptions
 import { getDefaultOptions as getAliDefaultOptions } from './ali/getDefaultOptions'
 import { getDefaultOptions as getSwanDefaultOptions } from './swan/getDefaultOptions'
 import { getDefaultOptions as getWebDefaultOptions } from './web/getDefaultOptions'
+import { getDefaultOptions as getTenonDefaultOptions } from './tenon/getDefaultOptions'
 import { error } from '../../helper/log'
 
 export default function createFactory (type) {
@@ -11,7 +12,7 @@ export default function createFactory (type) {
     options.__nativeRender__ = !!isNative
     options.__type__ = type
     let ctor
-    if (__mpx_mode__ !== 'web') {
+    if (__mpx_mode__ !== 'web' && __mpx_mode__ !== 'tenon') {
       if (customCtor) {
         ctor = customCtor
         customCtorType = customCtorType || type
@@ -41,6 +42,8 @@ export default function createFactory (type) {
     let getDefaultOptions
     if (__mpx_mode__ === 'web') {
       getDefaultOptions = getWebDefaultOptions
+    } else if (__mpx_mode__ === 'tenon') {
+      getDefaultOptions = getTenonDefaultOptions
     } else if (__mpx_mode__ === 'ali') {
       getDefaultOptions = getAliDefaultOptions
     } else if (__mpx_mode__ === 'swan') {
@@ -54,7 +57,7 @@ export default function createFactory (type) {
     // 将合并后的用户定义的rawOptions传入获取当前应该注入的内建mixins
     rawOptions.mixins = getBuiltInMixins(rawOptions, type)
     const defaultOptions = getDefaultOptions(type, { rawOptions, currentInject })
-    if (__mpx_mode__ === 'web') {
+    if (__mpx_mode__ === 'web' || __mpx_mode__ === 'tenon') {
       global.currentOption = defaultOptions
     } else if (ctor) {
       return ctor(defaultOptions)

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

@@ -2,13 +2,17 @@ import mergeOptions from '../../../core/mergeOptions'
 import { initProxy, filterOptions } from '../wx/getDefaultOptions'
 
 export function getDefaultOptions (type, { rawOptions = {}, currentInject }) {
-  let hookNames = ['attached', 'ready', 'detached']
+  const hookNames = ['attached', 'ready', 'detached']
+  // 构造页面时统一使用onInit进行初始化
+  if (type === 'page') {
+    hookNames[0] = 'onInit'
+  }
   // 当用户传入page作为构造器构造页面时，修改所有关键hooks
   if (rawOptions.__pageCtor__) {
-    hookNames = ['onLoad', 'onReady', 'onUnload']
+    hookNames[1] = 'onReady'
+    hookNames[2] = 'onUnload'
   }
-
-  const rootMixin = {
+  const rootMixins = [{
     [hookNames[0]] (...params) {
       if (!this.__mpxProxy) {
         initProxy(this, rawOptions, currentInject, params)
@@ -20,18 +24,7 @@ export function getDefaultOptions (type, { rawOptions = {}, currentInject }) {
     [hookNames[2]] () {
       this.__mpxProxy && this.__mpxProxy.destroyed()
     }
-  }
-
-  // 如构造页面，优先使用onInit进行初始化
-  if (type === 'page') {
-    rootMixin.onInit = function (...params) {
-      if (!this.__mpxProxy) {
-        initProxy(this, rawOptions, currentInject, params)
-      }
-    }
-  }
-
-  const rootMixins = [rootMixin]
+  }]
   rawOptions.mixins = rawOptions.mixins ? rootMixins.concat(rawOptions.mixins) : rootMixins
   rawOptions = mergeOptions(rawOptions, type, false)
   return filterOptions(rawOptions)

package/src/platform/patch/swan/lifecycle.js

@@ -40,7 +40,8 @@ const COMPONENT_HOOKS = [
 
 export const lifecycleProxyMap = {
   [BEFORECREATE]: ['beforeCreate'],
-  [CREATED]: ['onInit', 'created', 'attached'],
+  // 为提升性能统一把onInit和onLoad都代理到CREATED中，由onInit触发
+  [CREATED]: ['onInit', 'created', 'attached', 'onLoad'],
   [UPDATED]: ['updated'],
   [BEFOREMOUNT]: ['beforeMount'],
   [MOUNTED]: ['ready', 'onReady'],

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

@@ -0,0 +1,57 @@
+import builtInKeysMap from '../builtInKeysMap'
+import mergeOptions from '../../../core/mergeOptions'
+import MPXProxy from '../../../core/proxy'
+import { diffAndCloneA } from '../../../helper/utils'
+
+function filterOptions (options) {
+  const newOptions = {}
+  Object.keys(options).forEach(key => {
+    if (builtInKeysMap[key]) {
+      return
+    }
+    // Tenon 使用的Vue3 语法中 data 配置需要为一个函数
+    if (key === 'data' || key === 'dataFn') {
+      newOptions.data = function mergeFn () {
+        return Object.assign(
+          diffAndCloneA(options.data || {}).clone,
+          options.dataFn && options.dataFn.call(this)
+        )
+      }
+    } else {
+      newOptions[key] = options[key]
+    }
+  })
+  return newOptions
+}
+
+function initProxy (context, rawOptions) {
+  // 缓存options
+  context.$rawOptions = rawOptions
+  // 创建proxy对象
+  const mpxProxy = new MPXProxy(rawOptions, context)
+  context.__mpxProxy = mpxProxy
+  context.__mpxProxy.created()
+}
+
+export function getDefaultOptions (type, { rawOptions = {} }) {
+  const rootMixins = [{
+    created () {
+      if (!this.__mpxProxy) {
+        initProxy(this, rawOptions)
+      }
+    },
+    mounted () {
+      this.__mpxProxy && this.__mpxProxy.mounted()
+    },
+    updated () {
+      this.__mpxProxy && this.__mpxProxy.updated()
+    },
+    destroyed () {
+      this.__mpxProxy && this.__mpxProxy.destroyed()
+    }
+  }]
+  // 为了在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/tenon/lifecycle.js

@@ -0,0 +1,45 @@
+const COMPONENT_HOOKS = [
+  'beforeCreate',
+  'created',
+  'beforeMount',
+  'mounted',
+  'beforeUpdate',
+  'updated',
+  // 'activated',
+  // 'deactivated',
+  'beforeDestroy',
+  'destroyed',
+  'errorCaptured'
+  // 'onPageNotFound'
+]
+
+const PAGE_HOOKS = [
+  ...COMPONENT_HOOKS,
+  'onLoad',
+  'onReady',
+  'onShow',
+  'onHide',
+  'onUnload'
+  // '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
+}

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

@@ -38,7 +38,6 @@ export function getDefaultOptions (type, { rawOptions = {} }) {
       if (!this.__mpxProxy) {
         const query = (global.__mpxRouter && global.__mpxRouter.currentRoute && global.__mpxRouter.currentRoute.query) || {}
         initProxy(this, rawOptions, [query])
-        this.onLoad && this.onLoad(query)
       }
     },
     mounted () {

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

@@ -128,10 +128,12 @@ export function initProxy (context, rawOptions, currentInject, params) {
 }
 
 export function getDefaultOptions (type, { rawOptions = {}, currentInject }) {
-  let hookNames = ['attached', 'ready', 'detached']
+  const hookNames = ['attached', 'ready', 'detached']
   // 当用户传入page作为构造器构造页面时，修改所有关键hooks
   if (rawOptions.__pageCtor__) {
-    hookNames = ['onLoad', 'onReady', 'onUnload']
+    hookNames[0] = 'onLoad'
+    hookNames[1] = 'onReady'
+    hookNames[2] = 'onUnload'
   }
   const rootMixins = [{
     [hookNames[0]] (...params) {

package/src/vue.tenon.js

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