@mpxjs/core 2.6.94 → 2.6.98

package/@types/index.d.ts

@@ -146,7 +146,6 @@ interface ComponentOpt<D, P, C, M, Mi extends Array<any>> extends Partial<Wechat
 
   externalClasses?: string[]
 
-
   lifetimes?: Partial<WechatMiniprogram.Component.Lifetimes>
 
   pageLifetimes?: Partial<WechatMiniprogram.Component.PageLifetimes>
@@ -164,7 +163,6 @@ 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 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
@@ -236,11 +234,11 @@ type ComponentIns<D, P, C, M, Mi extends Array<any>, O = {}> =
   GetComputedType<C & UnboxMixinsField<Mi, 'computed'>> &
   WxComponentIns<D> & MpxComponentIns & MpxComProps<O>
 
-interface createConfig {
+interface CreateConfig {
   customCtor: any
 }
 
-export function createComponent<D extends Data = {}, P extends Properties = {}, C = {}, M extends Methods = {}, Mi extends Array<any> = [], O = {}> (opt: ThisTypedComponentOpt<D, P, C, M, Mi, O>, config?: createConfig): void
+export function createComponent<D extends Data = {}, P extends Properties = {}, C = {}, M extends Methods = {}, Mi extends Array<any> = [], O = {}> (opt: ThisTypedComponentOpt<D, P, C, M, Mi, O>, config?: CreateConfig): void
 
 export function getMixin<D extends Data = {}, P extends Properties = {}, C = {}, M extends Methods = {}, Mi extends Array<any> = [], O = {}> (opt: ThisTypedComponentOpt<D, P, C, M, Mi, O>): {
   data: GetDataType<D> & UnboxMixinsField<Mi, 'data'>
@@ -250,9 +248,9 @@ export function getMixin<D extends Data = {}, P extends Properties = {}, C = {},
   [index: string]: any
 }
 
-export function createPage<D extends Data = {}, P extends Properties = {}, C = {}, M extends Methods = {}, Mi extends Array<any> = [], O = {}> (opt: ThisTypedPageOpt<D, P, C, M, Mi, O>, config?: createConfig): void
+export function createPage<D extends Data = {}, P extends Properties = {}, C = {}, M extends Methods = {}, Mi extends Array<any> = [], O = {}> (opt: ThisTypedPageOpt<D, P, C, M, Mi, O>, config?: CreateConfig): void
 
-export function createApp<T extends WechatMiniprogram.IAnyObject> (opt: WechatMiniprogram.App.Options<T>, config?: createConfig): void
+export function createApp<T extends WechatMiniprogram.IAnyObject> (opt: WechatMiniprogram.App.Options<T>, config?: CreateConfig): void
 
 export function createStore<S, G extends Getters<S>, M extends Mutations<S>, A extends Actions<S, G>, D extends Deps = {}> (option: StoreOpt<S, G, M, A, D>): Store<S, G, M, A, D>
 
@@ -286,19 +284,9 @@ export function createActionsWithThis<S = {}, G = {}, M extends MutationsAndActi
   deps?: D
 }): A
 
-export function injectMixins (mixins: object | Array<object>, type?: 'page' | 'component' | 'app'): void
-
-declare class Watcher {
-  constructor (context: any, expr: string | (() => any), handler: WatchHandler | WatchOptWithHandler, options?: WatchOpt)
-
-  getValue (): any
+type MixinType = 'app' | 'page' | 'component'
 
-  update (): void
-
-  run (): void
-
-  destroy (): void
-}
+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
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.6.94",
+  "version": "2.6.98",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -40,5 +40,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "b651750b570344572df7c3d26297b73ec404cba2"
+  "gitHead": "c92623625bb16ba8d73c6795fbb36de34570ee51"
 }

package/src/convertor/wxToAli.js

@@ -5,7 +5,6 @@ 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']
 

package/src/convertor/wxToSwan.js

@@ -1,6 +1,5 @@
 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'

package/src/convertor/wxToWeb.js

@@ -4,7 +4,6 @@ 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']

package/src/core/injectMixins.js

@@ -1,38 +1,63 @@
-const MIXINS_MAPS = {
-  app: [],
-  page: [],
-  component: []
+import flatten from 'lodash/flatten.js'
+
+const mixinsQueueMap = {
+  app: [[], []],
+  page: [[], []],
+  component: [[], []]
+}
+
+export function clearInjectMixins () {
+  mixinsQueueMap.app = [[], []]
+  mixinsQueueMap.page = [[], []]
+  mixinsQueueMap.component = [[], []]
 }
 
-export function injectMixins (mixins, type) {
-  if (typeof type === 'string') {
-    type = [type]
-  } else {
-    type = ['app', 'page', 'component']
+export function injectMixins (mixins, options = {}) {
+  if (typeof options === 'string' || Array.isArray(options)) {
+    options = {
+      types: options
+    }
+  }
+
+  let types = options.types || ['app', 'page', 'component']
+  let stage = options.stage || -1
+
+  if (typeof types === 'string') {
+    types = [types]
   }
 
   if (!Array.isArray(mixins)) {
     mixins = [mixins]
   }
-  type.forEach(key => {
-    const curMixins = MIXINS_MAPS[key]
-    if (curMixins) {
-      for (const mixin of mixins) {
-        curMixins.indexOf(mixin) === -1 && curMixins.push(mixin)
+
+  mixins.stage = stage
+
+  types.forEach(type => {
+    const mixinsQueue = stage < 0 ? mixinsQueueMap[type][0] : mixinsQueueMap[type][1]
+    for (let i = 0; i <= mixinsQueue.length; i++) {
+      if (i === mixinsQueue.length) {
+        mixinsQueue.push(mixins)
+        break
+      }
+      const item = mixinsQueue[i]
+      if (mixins === item) break
+      if (stage < item.stage) {
+        mixinsQueue.splice(i, 0, mixins)
+        break
       }
     }
   })
-  return this
-}
 
-export function getInjectedMixins (type) {
-  return MIXINS_MAPS[type].slice(0)
+  return this
 }
 
 export function mergeInjectedMixins (options, type) {
-  const injectedMixins = getInjectedMixins(type)
-  if (injectedMixins.length) {
-    options.mixins = options.mixins ? injectedMixins.concat(options.mixins) : injectedMixins
+  const before = flatten(mixinsQueueMap[type][0])
+  const middle = options.mixins || []
+  const after = flatten(mixinsQueueMap[type][1])
+  const mixins = before.concat(middle).concat(after)
+  if (mixins.length) {
+    options.mixins = mixins
   }
   return options
 }

package/src/helper/MpxScroll/index.js

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