@mpxjs/core 2.8.2 → 2.8.4

package/@types/index.d.ts

@@ -428,7 +428,7 @@ type WatchSource<T> =
   | (() => T) // getter
   | ComputedRef<T>
 
-type MultiWatchSources = (WatchSource<unknown> | object)[]
+// type MultiWatchSources = (WatchSource<unknown> | object)[]
 
 interface WatchEffectOptions {
   flush?: 'pre' | 'post' | 'sync' // default: 'pre'
@@ -528,14 +528,11 @@ export function watchPostEffect (
   options?: WatchEffectOptions
 ): void
 
-export function watch<T extends MultiWatchSources> (
-  sources: [...T],
-  callback: WatchCallback<T>,
-  options?: WatchOptions
-): () => void
-export function watch<T extends Readonly<MultiWatchSources>> (
+export function watch<T extends Readonly<(WatchSource<unknown> | object)[]>> (
   sources: T,
-  callback: WatchCallback<T>,
+  callback: WatchCallback<{
+    [K in keyof T]: T[K] extends WatchSource<infer V> ? V : T[K] extends object ? T[K] : never
+  }>,
   options?: WatchOptions
 ): () => void
 export function watch<T> ( // for single watcher

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.8.2",
+  "version": "2.8.4",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -47,5 +47,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "002bf2a6960d5bab86b7774e81386ce4e74cd8dc"
+  "gitHead": "a86c688ee61f5c313feb1b1c28d03ab26cd42d37"
 }

package/src/core/mergeOptions.js

@@ -15,7 +15,7 @@ let curType
 let convertRule
 let mpxCustomKeysMap
 
-export default function mergeOptions (options = {}, type, needConvert = true) {
+export default function mergeOptions (options = {}, type, needConvert) {
   // 缓存混合模式下的自定义属性列表
   mpxCustomKeysMap = makeMap(options.mpxCustomKeysForBlend || [])
   // needConvert为false，表示衔接原生的root配置，那么此时的配置都是当前原生环境支持的配置，不需要转换

package/src/core/transferOptions.js

@@ -3,7 +3,7 @@ import mergeOptions from './mergeOptions'
 import { getConvertMode } from '../convertor/getConvertMode'
 import { warn, findItem } from '@mpxjs/utils'
 
-export default function transferOptions (options, type) {
+export default function transferOptions (options, type, needConvert = true) {
   let currentInject
   if (global.currentInject && global.currentInject.moduleId === global.currentModuleId) {
     currentInject = global.currentInject
@@ -28,7 +28,7 @@ export default function transferOptions (options, type) {
   }
   // 转换mode
   options.mpxConvertMode = options.mpxConvertMode || getConvertMode(global.currentSrcMode)
-  const rawOptions = mergeOptions(options, type)
+  const rawOptions = mergeOptions(options, type, needConvert)
 
   if (currentInject && currentInject.propKeys) {
     const computedKeys = Object.keys(rawOptions.computed || {})

package/src/platform/createApp.js

@@ -68,7 +68,8 @@ export default function createApp (option, config = {}) {
       }
     })
   }
-  const { rawOptions } = transferOptions(option, 'app')
+  // app选项目前不需要进行转换
+  const { rawOptions } = transferOptions(option, 'app', false)
   rawOptions.mixins = builtInMixins
   const defaultOptions = filterOptions(spreadProp(mergeOptions(rawOptions, 'app', false), 'methods'), appData)