@mpxjs/core 2.7.50 → 2.8.0-beta.2

package/@types/index.d.ts

@@ -13,7 +13,7 @@ import VueI18n from 'vue-i18n'
 
 declare module 'vue-i18n' {
   export default interface VueI18n {
-    mergeMessages(messages: {[index: string]:VueI18n.LocaleMessageObject}): void;
+    mergeMessages (messages: { [index: string]: VueI18n.LocaleMessageObject }): void;
   }
 }
 // declare Store types
@@ -135,7 +135,19 @@ type UnboxMixinField<T extends Mixin<{}, {}, {}, {}>, F> = F extends keyof T ? T
 type UnboxMixinsField<Mi extends Array<any>, F> =
   UnionToIntersection<RequiredPropertiesForUnion<UnboxMixinField<ArrayType<Mi>, F>>>
 
-interface ComponentOpt<D, P, C, M, Mi extends Array<any>> extends Partial<WechatMiniprogram.Component.Lifetimes> {
+interface Context {
+  triggerEvent: WechatMiniprogram.Component.InstanceMethods<Record<string, any>>['triggerEvent']
+  refs: ObjectOf<WechatMiniprogram.NodesRef & ComponentIns<{}, {}, {}, {}, []>>
+
+  forceUpdate (params?: object, callback?: () => void): void
+
+  selectComponent: ReplaceWxComponentIns['selectComponent']
+  selectAllComponents: ReplaceWxComponentIns['selectAllComponents']
+  createSelectorQuery: WechatMiniprogram.Component.InstanceMethods<Record<string, any>>['createSelectorQuery']
+  createIntersectionObserver: WechatMiniprogram.Component.InstanceMethods<Record<string, any>>['createIntersectionObserver']
+}
+
+interface ComponentOpt<D, P, C, M, Mi extends Array<any>, S extends Record<any, any>> extends Partial<WechatMiniprogram.Component.Lifetimes> {
   data?: D
   properties?: P
   computed?: C
@@ -149,6 +161,8 @@ interface ComponentOpt<D, P, C, M, Mi extends Array<any>> extends Partial<Wechat
     styleIsolation: string
   }>
 
+  setup?: (props: GetPropsType<P & UnboxMixinsField<Mi, 'properties'>>, context: Context) => S
+
   pageShow?: () => void
 
   pageHide?: () => void
@@ -164,17 +178,17 @@ interface ComponentOpt<D, P, C, M, Mi extends Array<any>> extends Partial<Wechat
   [index: string]: any
 }
 
-type PageOpt<D, P, C, M, Mi extends Array<any>> =
-  ComponentOpt<D, P, C, M, Mi>
+type PageOpt<D, P, C, M, Mi extends Array<any>, S extends Record<any, any>> =
+  ComponentOpt<D, P, C, M, Mi, S>
   & Partial<WechatMiniprogram.Page.ILifetime>
 
-type ThisTypedPageOpt<D, P, C, M, Mi extends Array<any>, O = {}> =
-  PageOpt<D, P, C, M, Mi>
-  & ThisType<ComponentIns<D, P, C, M, Mi, O>> & O
+type ThisTypedPageOpt<D, P, C, M, Mi extends Array<any>, S extends Record<any, any>, O = {}> =
+  PageOpt<D, P, C, M, Mi, S>
+  & ThisType<ComponentIns<D, P, C, M, Mi, S, O>> & O
 
-type ThisTypedComponentOpt<D, P, C, M, Mi extends Array<any>, O = {}> =
-  ComponentOpt<D, P, C, M, Mi>
-  & ThisType<ComponentIns<D, P, C, M, Mi, O>> & O
+type ThisTypedComponentOpt<D, P, C, M, Mi extends Array<any>, S extends Record<any, any>, O = {}> =
+  ComponentOpt<D, P, C, M, Mi, S>
+  & ThisType<ComponentIns<D, P, C, M, Mi, S, O>> & O
 
 type I18nValues = {
   [k: string]: string
@@ -182,9 +196,9 @@ type I18nValues = {
 
 declare function get (obj: object, key: string): any
 
-declare function set (obj: object, key: string, value: any): any
+// declare function set (obj: object, key: string, value: any): any
 
-declare function del (obj: object, key: string): any
+// declare function del (obj: object, key: string): any
 
 declare function t (key: string, values?: I18nValues): string
 
@@ -192,6 +206,8 @@ declare function tc (key: string, choice: number, values?: I18nValues): string
 
 declare function te (key: string): boolean
 
+declare function tm (key: string): any
+
 export function observable<T extends object> (obj: T): T
 
 type MpxComProps<O> = { $rawOptions: O }
@@ -212,16 +228,14 @@ export interface MpxComponentIns {
 
   $nextTick (fn: () => void): void
 
-  $i18n: {
-    locale: string
-  }
-
   $t: typeof t
 
   $tc: typeof tc
 
   $te: typeof te
 
+  $tm: typeof tm
+
   [k: string]: any
 }
 
@@ -236,9 +250,9 @@ type WxComponentIns<D> =
   & WechatMiniprogram.Component.InstanceProperties
   & WechatMiniprogram.Component.InstanceMethods<D>
 
-type ComponentIns<D, P, C, M, Mi extends Array<any>, O = {}> =
+type ComponentIns<D, P, C, M, Mi extends Array<any>, S extends Record<any, any> = {}, O = {}> =
   GetDataType<D> & UnboxMixinsField<Mi, 'data'> &
-  M & UnboxMixinsField<Mi, 'methods'> &
+  M & UnboxMixinsField<Mi, 'methods'> & { [K in keyof S]: S[K] extends Ref<infer V> ? V : S[K] } &
   GetPropsType<P & UnboxMixinsField<Mi, 'properties'>> &
   GetComputedType<C & UnboxMixinsField<Mi, 'computed'>> &
   WxComponentIns<D> & MpxComponentIns & MpxComProps<O>
@@ -297,7 +311,7 @@ type MixinType = 'app' | 'page' | 'component'
 
 export function injectMixins (mixins: object | Array<object>, options?: MixinType | MixinType[] | { types?: MixinType | MixinType[], stage?: number }): void
 
-export function watch (expr: string | (() => any), handler: WatchHandler | WatchOptWithHandler, options?: WatchOpt): () => void
+// export function watch (expr: string | (() => any), handler: WatchHandler | WatchOptWithHandler, options?: WatchOpt): () => void
 
 interface AnyConstructor {
   new (...args: any[]): any
@@ -339,7 +353,7 @@ export interface Mpx {
   toPureObject: typeof toPureObject
   observable: typeof observable
 
-  watch: typeof watch
+  // watch: typeof watch
 
   use (plugin: ((...args: any) => any) | { install: (...args: any) => any, [key: string]: any }, ...rest: any): Mpx
 
@@ -354,13 +368,8 @@ export interface Mpx {
   config: MpxConfig
 
   i18n: {
-    locale: string,
-    version: number
-    t: typeof t
-    tc: typeof tc
-    te: typeof te
-    mergeMessages (messages: object): void
-    mergeLocaleMessage (locale: string, message: object): void
+    readonly global: UseI18n
+    dispose (): void
   }
 }
 
@@ -371,3 +380,309 @@ type GetFunctionKey<T> = {
 declare let mpx: Mpx & Pick<WechatMiniprogram.Wx, GetFunctionKey<WechatMiniprogram.Wx>>
 
 export default mpx
+
+// composition api
+
+declare const RefSymbol: unique symbol
+declare const ReactiveSymbol: unique symbol
+declare const ComputedRefSymbol: unique symbol
+declare const ShallowRefMarker: unique symbol
+declare const ShallowReactiveMarker: unique symbol
+
+export interface Ref<T = any> {
+  value: T
+  /**
+   * Type differentiator only.
+   * We need this to be in public d.ts but don't want it to show up in IDE
+   * autocomplete, so we use a private Symbol instead.
+   */
+    [RefSymbol]: true
+}
+
+type CollectionTypes = IterableCollections | WeakCollections
+
+type IterableCollections = Map<any, any> | Set<any>
+type WeakCollections = WeakMap<any, any> | WeakSet<any>
+
+/**
+ * This is a special exported interface for other packages to declare
+ * additional types that should bail out for ref unwrapping. For example
+ *
+ * ``` ts
+ * declare module '@mpxjs/core' {
+ *   export interface RefUnwrapBailTypes {
+ *     runtimeDOMBailTypes: Node | Window
+ *   }
+ * }
+ * ```
+ *
+ * Note that api-extractor somehow refuses to include `declare module`
+ * augmentations in its generated d.ts, so we have to manually append them
+ * to the final generated d.ts in our build process.
+ */
+export interface RefUnwrapBailTypes {
+}
+
+export type UnwrapRef<T> = T extends ShallowRef<infer V>
+  ? V
+  : T extends Ref<infer V>
+    ? UnwrapRefSimple<V>
+    : UnwrapRefSimple<T>
+
+export type UnwrapRefSimple<T> = T extends | Function
+  | CollectionTypes
+  | string | number | boolean
+  | Ref
+  | RefUnwrapBailTypes[keyof RefUnwrapBailTypes]
+  ? T
+  : T extends Array<any>
+    ? { [K in keyof T]: UnwrapRefSimple<T[K]> }
+    : T extends object & { [ShallowReactiveMarker]?: never } // not a shallowReactive
+      ? { [P in keyof T]: P extends symbol ? T[P] : UnwrapRef<T[P]> }
+      : T
+
+// If the the type T accepts type "any", output type Y, otherwise output type N.
+// https://stackoverflow.com/questions/49927523/disallow-call-with-any/49928360#49928360
+export type IfAny<T, Y, N> = 0 extends 1 & T ? Y : N
+export type ToRef<T> = IfAny<T, Ref<T>, [T] extends [Ref] ? T : Ref<T>>
+
+export type ToRefs<T = any> = {
+  [K in keyof T]: ToRef<T[K]>
+}
+
+export type CustomRefFactory<T> = (
+  track: () => void,
+  trigger: () => void
+) => {
+  get: () => T
+  set: (value: T) => void
+}
+
+export type ShallowRef<T = any> = Ref<T> & { [ShallowRefMarker]?: true }
+
+export type ShallowReactive<T> = T & { [ShallowReactiveMarker]?: true }
+
+export type UnwrapNestedRefs<T> = T extends Ref ? T : UnwrapRefSimple<T>
+
+export type Reactive<T> = UnwrapNestedRefs<T> & { [ReactiveSymbol]: true }
+
+export interface WritableComputedOptions<T> {
+  get: (...args: any[]) => T
+  set: (v: T) => void
+}
+
+export interface ComputedRef<T = any> extends WritableComputedRef<T> {
+  readonly value: T
+  [ComputedRefSymbol]: true
+}
+
+export interface WritableComputedRef<T> extends Ref<T> {
+  // readonly effect: ReactiveEffect<T>
+}
+
+type WatchCallback<T> = (
+  value: T,
+  oldValue: T,
+  onCleanup: (cleanupFn: () => void) => void
+) => void
+
+type WatchSource<T> =
+  | Ref<T> // ref
+  | ComputedRef<T>
+  | Reactive<T>
+  | (() => T) // getter
+
+type MultiWatchSources = (WatchSource<unknown> | object)[]
+
+interface WatchEffectOptions {
+  flush?: 'pre' | 'post' | 'sync' // default: 'pre'
+}
+
+interface WatchOptions extends WatchEffectOptions {
+  immediate?: boolean // 默认：false
+  deep?: boolean // 默认：false
+  flush?: 'pre' | 'post' | 'sync' // 默认：'pre'
+}
+
+interface EffectScope {
+  run<T> (fn: () => T): T | undefined // 如果作用域不活跃就为 undefined
+  stop (): void
+}
+
+
+type StringObj = {
+  [k: string]: string | StringObj
+}
+
+interface UseI18n {
+  id: number
+  locale: string
+  fallbackLocale: string
+  readonly messages: StringObj
+  readonly isGlobal: boolean
+  inheritLocale: boolean
+  fallbackRoot: boolean
+
+  t (key: string, values?: I18nValues): string
+
+  t (key: string, choice: number, values?: I18nValues): string
+
+  te (key: string): boolean
+
+  tm (key: string): any
+
+  getLocaleMessage (locale: string): StringObj
+
+  setLocaleMessage (locale: string, messages: StringObj): void
+
+  mergeLocaleMessage (locale: string, messages: StringObj): void
+}
+
+
+export function ref<T extends object> (
+  value: T
+): [T] extends [Ref] ? T : Ref<UnwrapRef<T>>
+export function ref<T> (value: T): Ref<UnwrapRef<T>>
+export function ref<T = any> (): Ref<T | undefined>
+
+export function unref<T> (ref: T | Ref<T>): T
+
+export function toRef<T extends object, K extends keyof T> (object: T, key: K): ToRef<T[K]>
+export function toRef<T extends object, K extends keyof T> (object: T, key: K, defaultValue: T[K]): ToRef<Exclude<T[K], undefined>>
+
+export function toRefs<T extends object> (object: T): ToRefs<T>
+
+export function isRef<T> (r: Ref<T> | unknown): r is Ref<T>
+export function isRef (r: any): r is Ref
+
+export function customRef<T> (factory: CustomRefFactory<T>): Ref<T>
+
+export function shallowRef<T extends object> (value: T): T extends Ref ? T : ShallowRef<T>
+export function shallowRef<T> (value: T): ShallowRef<T>
+export function shallowRef<T = any> (): ShallowRef<T | undefined>
+
+export function triggerRef (ref: Ref): void
+
+export function reactive<T extends object> (target: T): Reactive<T>
+
+export function isReactive (value: unknown): boolean
+
+/**
+ * Return a shallowly-reactive copy of the original object, where only the root
+ * level properties are reactive. It also does not auto-unwrap refs (even at the
+ * root level).
+ */
+export function shallowReactive<T extends object> (target: T): ShallowReactive<T>
+
+export function computed<T> (
+  getter: (...args: any[]) => T
+): ComputedRef<T>
+export function computed<T> (
+  options: WritableComputedOptions<T>
+): WritableComputedRef<T>
+
+
+export function watchEffect (
+  effect: (onCleanup: (cleanupFn: () => void) => void) => void,
+  options?: WatchEffectOptions
+): () => void
+
+export function watchSyncEffect (
+  effect: (onCleanup: (cleanupFn: () => void) => void) => void,
+  options?: WatchEffectOptions
+): void
+
+export function watchPostEffect (
+  effect: (onCleanup: (cleanupFn: () => void) => void) => void,
+  options?: WatchEffectOptions
+): void
+
+export function watch<T extends MultiWatchSources> (
+  sources: [...T],
+  callback: WatchCallback<T>,
+  options?: WatchOptions
+): () => void
+export function watch<T extends Readonly<MultiWatchSources>> (
+  sources: T,
+  callback: WatchCallback<T>,
+  options?: WatchOptions
+): () => void
+export function watch<T> ( // for single watcher
+  source: WatchSource<T>,
+  callback: WatchCallback<T>,
+  options?: WatchOptions
+): () => void
+export function watch<T extends Reactive<object>> ( // for reactive value
+  source: T,
+  callback: WatchCallback<T>,
+  options?: WatchOptions
+): () => void
+
+export function effectScope (detached?: boolean): EffectScope
+
+export function getCurrentScope (): EffectScope | undefined
+
+export function onScopeDispose (fn: () => void): void
+
+export function set<T extends object> (target: T, key: string | number, value: any): void
+
+export function del<T extends object> (target: T, key: keyof T): void
+
+// nextTick
+export function nextTick (fn: () => any): void
+
+// lifecycle
+export function onBeforeMount (callback: () => void): void
+
+export function onMounted (callback: () => void): void
+
+export function onBeforeUpdate (callback: () => void): void
+
+export function onUpdated (callback: () => void): void
+
+export function onBeforeUnmount (callback: () => void): void
+
+export function onUnmounted (callback: () => void): void
+
+export function onLoad<T extends object> (callback: (query: T) => void): void
+
+export function onShow (callback: () => void): void
+
+export function onHide (callback: () => void): void
+
+export function onResize (callback: () => void): void
+
+// get instance
+export function getCurrentInstance<T extends object> (): { target: T }
+
+// I18n
+export function useI18n<Options extends {
+  inheritLocale?: boolean
+  fallbackRoot?: boolean
+  locale?: string
+  fallbackLocale?: string
+  messages: StringObj
+}> (
+  options?: Options
+): UseI18n
+
+// inner lifecycle
+export const BEFORECREATE: string
+export const CREATED: string
+export const BEFOREMOUNT: string
+export const MOUNTED: string
+export const BEFOREUPDATE: string
+export const UPDATED: string
+export const BEFOREUNMOUNT: string
+export const UNMOUNTED: string
+export const ONLOAD: string
+export const ONSHOW: string
+export const ONHIDE: string
+export const ONRESIZE: string
+
+declare global {
+  const defineProps: <T>(props: T) => Readonly<GetPropsType<T>>
+  const defineOptions: <D extends Data = {}, P extends Properties = {}, C = {}, M extends Methods = {}, Mi extends Array<any> = [], O = {}> (opt: ThisTypedComponentOpt<D, P, C, M, Mi, O>) => void
+  const defineExpose: <E extends Record<string, any> = Record<string, any>>(exposed?: E) => void
+  const useContext: () => Context
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.7.50",
+  "version": "2.8.0-beta.2",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -19,16 +19,21 @@
   ],
   "main": "src/index.js",
   "dependencies": {
+    "@mpxjs/utils": "^2.8.0-beta.2",
     "lodash": "^4.1.1",
     "miniprogram-api-typings": "^3.0.2"
   },
   "peerDependencies": {
     "@mpxjs/api-proxy": "^2.7.44",
-    "vue": "^2.6.10",
-    "vue-i18n": "^8.15.3"
+    "@mpxjs/store": "^2.8.0",
+    "vue": "^2.7.10",
+    "vue-demi": "^0.13.11",
+    "vue-i18n": "^8.27.2",
+    "vue-i18n-bridge": "^9.2.2"
   },
   "publishConfig": {
-    "registry": "https://registry.npmjs.org"
+    "registry": "https://registry.npmjs.org",
+    "access": "public"
   },
   "scripts": {
     "test": "echo \"Error: run tests from root\" && exit 1"
@@ -42,5 +47,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "f1fe0f7381ee7e153b0eb7994f25ade5c9f4f0ef"
+  "gitHead": "cd57f83a9d47236f527bd51a8650119514f4b433"
 }

package/src/convertor/convertor.js

@@ -3,7 +3,7 @@ import * as aliLifecycle from '../platform/patch/ali/lifecycle'
 import * as webLifecycle from '../platform/patch/web/lifecycle'
 import * as swanLifecycle from '../platform/patch/swan/lifecycle'
 import { mergeLifecycle } from './mergeLifecycle'
-import { error } from '../helper/log'
+import { error } from '@mpxjs/utils'
 import wxToAliRule from './wxToAli'
 import wxToWebRule from './wxToWeb'
 import wxToSwanRule from './wxToSwan'
@@ -59,7 +59,7 @@ const rulesMap = {
 }
 
 export function getConvertRule (convertMode) {
-  let rule = rulesMap[convertMode]
+  const rule = rulesMap[convertMode]
   if (!rule || !rule.lifecycle) {
     error(`Absence of convert rule for ${convertMode}, please check.`)
   } else {

package/src/convertor/mergeLifecycle.js

@@ -6,10 +6,10 @@ export function mergeLifecycle (lifecycle) {
     const pageHooks = (lifecycle.PAGE_HOOKS || []).concat(INNER_LIFECYCLES)
     const componentHooks = (lifecycle.COMPONENT_HOOKS || []).concat(INNER_LIFECYCLES)
     return {
-      'app': appHooks,
-      'page': pageHooks,
-      'component': componentHooks,
-      'blend': pageHooks.concat(lifecycle.COMPONENT_HOOKS || [])
+      app: appHooks,
+      page: pageHooks,
+      component: componentHooks,
+      blend: pageHooks.concat(lifecycle.COMPONENT_HOOKS || [])
     }
   }
 }

package/src/convertor/wxToAli.js

@@ -2,9 +2,8 @@ import * as wxLifecycle from '../platform/patch/wx/lifecycle'
 import * as aliLifecycle from '../platform/patch/ali/lifecycle'
 import { mergeLifecycle } from './mergeLifecycle'
 import { mergeToArray } from '../core/mergeOptions'
-import { error } from '../helper/log'
+import { error, hasOwn, isDev } from '@mpxjs/utils'
 import { implemented } from '../core/implement'
-import { hasOwn } from '../helper/utils'
 
 const unsupported = ['moved', 'definitionFilter']
 
@@ -16,7 +15,7 @@ function notSupportTip (options) {
   unsupported.forEach(key => {
     if (options[key]) {
       if (!implemented[key]) {
-        process.env.NODE_ENV !== 'production' && convertErrorDesc(key)
+        isDev && convertErrorDesc(key)
         delete options[key]
       } else if (implemented[key].remove) {
         delete options[key]
@@ -24,7 +23,7 @@ function notSupportTip (options) {
     }
   })
   // relations部分支持
-  const relations = options['relations']
+  const relations = options.relations
   if (relations) {
     Object.keys(relations).forEach(path => {
       const item = relations[path]

package/src/convertor/wxToSwan.js

@@ -1,4 +1,4 @@
-import { error } from '../helper/log'
+import { error, isDev } from '@mpxjs/utils'
 import { implemented } from '../core/implement'
 import { mergeLifecycle } from './mergeLifecycle'
 import * as wxLifecycle from '../platform/patch/wx/lifecycle'
@@ -19,7 +19,7 @@ function notSupportTip (options) {
   unsupported.forEach(key => {
     if (options[key]) {
       if (!implemented[key]) {
-        process.env.NODE_ENV !== 'production' && convertErrorDesc(key)
+        isDev && convertErrorDesc(key)
         delete options[key]
       } else if (implemented[key].remove) {
         delete options[key]

package/src/convertor/wxToTt.js

@@ -1,14 +1,5 @@
-import { error } from '../helper/log'
-
 export default {
   convert (options) {
-    if (options.behaviors) {
-      options.behaviors.forEach((behavior, idx) => {
-        if (typeof behavior === 'string') {
-          error(`Built-in behavior "${behavior}" is not supported in tt environment!`, global.currentResource)
-          options.behaviors.splice(idx, 1)
-        }
-      })
-    }
+    // 暂时无需转换
   }
 }

package/src/convertor/wxToWeb.js

@@ -1,12 +1,17 @@
 import * as wxLifecycle from '../platform/patch/wx/lifecycle'
 import * as webLifecycle from '../platform/patch/web/lifecycle'
 import { mergeLifecycle } from './mergeLifecycle'
-import { error } from '../helper/log'
-import { isObject, diffAndCloneA, hasOwn } from '../helper/utils'
+import {
+  isObject,
+  diffAndCloneA,
+  error,
+  hasOwn,
+  isDev
+} from '@mpxjs/utils'
 import { implemented } from '../core/implement'
 
 // 暂不支持的wx选项，后期需要各种花式支持
-const unsupported = ['moved', 'definitionFilter', 'onShareAppMessage', 'pageShow', 'pageHide']
+const unsupported = ['moved', 'definitionFilter', 'onShareAppMessage']
 
 function convertErrorDesc (key) {
   error(`Options.${key} is not supported in runtime conversion from wx to web.`, global.currentResource)
@@ -16,7 +21,7 @@ function notSupportTip (options) {
   unsupported.forEach(key => {
     if (options[key]) {
       if (!implemented[key]) {
-        process.env.NODE_ENV !== 'production' && convertErrorDesc(key)
+        isDev && convertErrorDesc(key)
         delete options[key]
       } else if (implemented[key].remove) {
         delete options[key]
@@ -46,9 +51,11 @@ export default {
             }
             if (hasOwn(prop, 'value')) {
               // vue中对于引用类型数据需要使用函数返回
-              newProp.default = isObject(prop.value) ? function propFn () {
-                return diffAndCloneA(prop.value).clone
-              } : prop.value
+              newProp.default = isObject(prop.value)
+                ? function propFn () {
+                  return diffAndCloneA(prop.value).clone
+                }
+                : prop.value
             }
             props[key] = newProp
           } else {

package/src/core/implement.js

@@ -1,8 +1,8 @@
-import { noop } from '../helper/utils'
+import { noop } from '@mpxjs/utils'
 
 export const implemented = {}
 
-export default function implement (name, { modes = [], processor = noop(), remove = false } = {}) {
+export function implement (name, { modes = [], processor = noop(), remove = false } = {}) {
   if (!name) return
   if (modes.indexOf(__mpx_mode__) > -1) {
     processor()

package/src/core/injectMixins.js

@@ -20,7 +20,7 @@ export function injectMixins (mixins, options = {}) {
   }
 
   let types = options.types || ['app', 'page', 'component']
-  let stage = options.stage || -1
+  const stage = options.stage || -1
 
   if (typeof types === 'string') {
     types = [types]

package/src/core/innerLifecycle.js

@@ -2,13 +2,26 @@ export const BEFORECREATE = '__beforeCreate__'
 export const CREATED = '__created__'
 export const BEFOREMOUNT = '__beforeMount__'
 export const MOUNTED = '__mounted__'
+export const BEFOREUPDATE = '__beforeUpdate__'
 export const UPDATED = '__updated__'
-export const DESTROYED = '__destroyed__'
+export const BEFOREUNMOUNT = '__beforeUnmount__'
+export const UNMOUNTED = '__unmounted__'
+export const ONLOAD = '__onLoad__'
+export const ONSHOW = '__onShow__'
+export const ONHIDE = '__onHide__'
+export const ONRESIZE = '__onResize__'
+
 export const INNER_LIFECYCLES = [
   BEFORECREATE,
   CREATED,
   BEFOREMOUNT,
   MOUNTED,
+  BEFOREUPDATE,
   UPDATED,
-  DESTROYED
+  BEFOREUNMOUNT,
+  UNMOUNTED,
+  ONLOAD,
+  ONSHOW,
+  ONHIDE,
+  ONRESIZE
 ]