@mpxjs/core 2.8.15 → 2.8.19

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.15",
+  "version": "2.8.19",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -47,5 +47,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "292c54cd571b1cdc3ca7cf9ffa8ab13ed2da6158"
+  "gitHead": "fca1b61f52c2ed8b3926e7b8a3a150d27904911a"
 }

package/src/core/mergeOptions.js

@@ -47,7 +47,7 @@ export default function mergeOptions (options = {}, type, needConvert) {
 
 export function getMixin (mixin = {}) {
   // 用于ts反向推导mixin类型
-  return mixin.mixins ? extractMixins({}, mixin, true) : mixin
+  return mixin
 }
 
 function extractMixins (mergeOptions, options, needConvert) {
@@ -214,7 +214,7 @@ function mergeMixins (parent, child) {
       mergeHooks(parent, child, key)
     } else if (/^(data|dataFn)$/.test(key)) {
       mergeDataFn(parent, child, key)
-    } else if (/^(computed|properties|props|methods|proto|options|relations)$/.test(key)) {
+    } else if (/^(computed|properties|props|methods|proto|options|relations|initData)$/.test(key)) {
       mergeShallowObj(parent, child, key)
     } else if (/^(watch|observers|pageLifetimes|events)$/.test(key)) {
       mergeToArray(parent, child, key)
@@ -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)

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

@@ -74,8 +74,14 @@ function filterOptions (options, type) {
     if (builtInKeysMap[key]) {
       return
     }
-    if (key === 'properties' || key === 'props') {
-      newOptions.props = Object.assign({}, options.props, options.properties)
+    if (key === 'data' || key === 'initData') {
+      if (!hasOwn(newOptions, 'data')) {
+        newOptions.data = Object.assign({}, options.initData, options.data)
+      }
+    } else if (key === 'properties' || key === 'props') {
+      if (!hasOwn(newOptions, 'props')) {
+        newOptions.props = Object.assign({}, options.props, options.properties)
+      }
     } else if (key === 'methods' && type === 'page') {
       Object.assign(newOptions, options[key])
     } else {

package/src/platform/patch/builtInKeysMap.js

@@ -1,10 +1,10 @@
 import { INNER_LIFECYCLES } from '../../core/innerLifecycle'
 import { makeMap } from '@mpxjs/utils'
 
-let bulitInKeys
+let builtInKeys
 
 if (__mpx_mode__ === 'web') {
-  bulitInKeys = [
+  builtInKeys = [
     'proto',
     'mixins',
     'mpxCustomKeysForBlend',
@@ -15,7 +15,7 @@ if (__mpx_mode__ === 'web') {
     '__pageCtor__'
   ]
 } else {
-  bulitInKeys = [
+  builtInKeys = [
     'setup',
     'dataFn',
     'proto',
@@ -31,4 +31,4 @@ if (__mpx_mode__ === 'web') {
   ]
 }
 
-export default makeMap(bulitInKeys.concat(INNER_LIFECYCLES))
+export default makeMap(builtInKeys.concat(INNER_LIFECYCLES))

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

@@ -1,6 +1,6 @@
 import builtInKeysMap from '../builtInKeysMap'
 import mergeOptions from '../../../core/mergeOptions'
-import { diffAndCloneA } from '@mpxjs/utils'
+import { diffAndCloneA, hasOwn } from '@mpxjs/utils'
 import { getCurrentInstance as getCurrentVueInstance } from '../../export/index'
 import MpxProxy, { setCurrentInstance, unsetCurrentInstance } from '../../../core/proxy'
 import { BEFOREUPDATE, UPDATED, BEFOREUNMOUNT, UNMOUNTED } from '../../../core/innerLifecycle'
@@ -12,11 +12,13 @@ function filterOptions (options) {
       return
     }
     if (key === 'data' || key === 'dataFn') {
-      newOptions.data = function mergeFn () {
-        return Object.assign(
-          diffAndCloneA(options.data || {}).clone,
-          options.dataFn && options.dataFn.call(this)
-        )
+      if (!hasOwn(newOptions, 'data')) {
+        newOptions.data = function mergeFn () {
+          return Object.assign(
+            diffAndCloneA(options.data || {}).clone,
+            options.dataFn && options.dataFn.call(this)
+          )
+        }
       }
     } else {
       newOptions[key] = options[key]

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

@@ -112,8 +112,14 @@ export function filterOptions (options) {
     if (builtInKeysMap[key]) {
       return
     }
-    if (key === 'properties' || key === 'props') {
-      newOptions.properties = transformProperties(Object.assign({}, options.properties, options.props))
+    if (key === 'data' || key === 'initData') {
+      if (!hasOwn(newOptions, 'data')) {
+        newOptions.data = Object.assign({}, options.initData, options.data)
+      }
+    } else if (key === 'properties' || key === 'props') {
+      if (!hasOwn(newOptions, 'properties')) {
+        newOptions.properties = transformProperties(Object.assign({}, options.props, options.properties))
+      }
     } else if (key === 'methods' && options.__pageCtor__) {
       // 构造器为Page时抽取所有methods方法到顶层
       Object.assign(newOptions, options[key])