@mpxjs/core 2.8.14 → 2.8.18

package/@types/index.d.ts

@@ -69,10 +69,6 @@ interface WatchField {
   [key: string]: WatchHandler | WatchOptWithHandler
 }
 
-interface ObserversDefs {
-  [expression: string]: (...fields: any[]) => any
-}
-
 type GetDataType<T> = T extends () => any ? ReturnType<T> : T
 
 type PropValueType<Def> = Def extends {
@@ -119,34 +115,19 @@ interface Context {
   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> {
+interface ComponentOpt<D, P, C, M, Mi extends Array<any>, S extends Record<any, any>> extends Partial<WechatMiniprogram.Component.Lifetimes & WechatMiniprogram.Component.OtherOption>{
   data?: D
   properties?: P
   computed?: C
   methods?: M
   mixins?: Mi
   watch?: WatchField
-  observers?: ObserversDefs
-  options?: Partial<{
-    addGlobalClass: boolean
-    multipleSlots: boolean
-    styleIsolation: string
-  }>
-
   setup?: (props: GetPropsType<P & UnboxMixinsField<Mi, 'properties'>>, context: Context) => S
 
   pageShow?: () => void
 
   pageHide?: () => void
 
-  externalClasses?: string[]
-
-  lifetimes?: Partial<WechatMiniprogram.Component.Lifetimes>
-
-  pageLifetimes?: Partial<WechatMiniprogram.Component.PageLifetimes>
-
-  relations?: { [key: string]: WechatMiniprogram.Component.RelationOption }
-
   [index: string]: any
 }
 
@@ -621,6 +602,28 @@ export function useI18n<Options extends {
   options?: Options
 ): UseI18n
 
+// `<script setup>`
+type NotUndefined<T> = T extends undefined ? never : T
+
+type InferDefaults<T> = {
+  [K in keyof T]?: InferDefault<T, NotUndefined<T[K]>>
+}
+
+type InferDefault<P, T> = T extends
+  | null
+  | number
+  | string
+  | boolean
+  | symbol
+  | Array<any>
+  | Object
+  ? T | ((props: P) => T)
+  : (props: P) => T
+
+type PropsWithDefaults<Base, Defaults> = Base & {
+  [K in keyof Defaults]: K extends keyof Base ? NotUndefined<Base[K]> : never
+}
+
 // inner lifecycle
 export const BEFORECREATE: string
 export const CREATED: string
@@ -640,4 +643,5 @@ declare global {
   const defineOptions: <D extends Data = {}, P extends Properties = {}, C = {}, M extends Methods = {}, Mi extends Array<any> = [], S extends AnyObject = {}, O extends AnyObject = {}> (opt: ThisTypedComponentOpt<D, P, C, M, Mi, S, O>) => void
   const defineExpose: <E extends AnyObject = AnyObject>(exposed?: E) => void
   const useContext: () => Context
+  const withDefaults: <Props, Defaults extends InferDefaults<Props>>(props: Props, defaults: Defaults) => PropsWithDefaults<Props, Defaults>
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.8.14",
+  "version": "2.8.18",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -19,7 +19,7 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@mpxjs/utils": "^2.8.14",
+    "@mpxjs/utils": "^2.8.15",
     "lodash": "^4.1.1",
     "miniprogram-api-typings": "^3.0.2"
   },
@@ -47,5 +47,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "47953f93b146a4998279b865e3c44041247a5006"
+  "gitHead": "fd022afc8f403756de44c9eaab105a5a689e9b07"
 }

package/src/core/mergeOptions.js

@@ -318,9 +318,6 @@ function composeHooks (target, includes) {
             const data = hooksArr[i].apply(this, args)
             data !== undefined && (result = data)
           }
-          if (result === '__abort__') {
-            break
-          }
         }
         return result
       })

package/src/core/transferOptions.js

@@ -24,7 +24,8 @@ export default function transferOptions (options, type, needConvert = true) {
   }
   if (currentInject && currentInject.pageEvents) {
     options.mixins = options.mixins || []
-    options.mixins.unshift(currentInject.pageEvents)
+    // 驱动层视作用户本地逻辑，作为最后的mixin来执行
+    options.mixins.push(currentInject.pageEvents)
   }
   // 转换mode
   options.mpxConvertMode = options.mpxConvertMode || getConvertMode(global.currentSrcMode)