@mpxjs/core 2.8.4 → 2.8.6

package/@types/index.d.ts

@@ -8,18 +8,11 @@
 /// <reference path="./node.d.ts" />
 
 // @ts-ignore
-import VueI18n from 'vue-i18n'
-
 import type { GetComputedType } from '@mpxjs/store'
 
+// @ts-ignore
 export * from '@mpxjs/store'
 
-declare module 'vue-i18n' {
-  export default interface VueI18n {
-    mergeMessages (messages: { [index: string]: VueI18n.LocaleMessageObject }): void;
-  }
-}
-
 // utils
 type ObjectOf<T> = {
   [key: string]: T
@@ -428,7 +421,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,7 +521,15 @@ export function watchPostEffect (
   options?: WatchEffectOptions
 ): void
 
-export function watch<T extends Readonly<(WatchSource<unknown> | object)[]>> (
+
+export function watch<T extends MultiWatchSources> (
+  sources: [...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 extends Readonly<MultiWatchSources>> (
   sources: T,
   callback: WatchCallback<{
     [K in keyof T]: T[K] extends WatchSource<infer V> ? V : T[K] extends object ? T[K] : never
@@ -572,27 +573,29 @@ 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 onLoad<T extends Record<string, string | undefined>> (callback: (query: T) => void): void
+// wechat dose not have generics
+// export function onLoad (callback: WechatMiniprogram.Page.ILifetime['onLoad']): void
 
-export function onShow (callback: () => void): void
+export function onShow (callback: WechatMiniprogram.Page.ILifetime['onShow']): void
 
-export function onHide (callback: () => void): void
+export function onHide (callback: WechatMiniprogram.Page.ILifetime['onHide']): void
 
-export function onResize (callback: () => void): void
+export function onResize (callback: WechatMiniprogram.Page.ILifetime['onResize']): void
 
-export function onPullDownRefresh (callback: () => void): void
+export function onPullDownRefresh (callback: WechatMiniprogram.Page.ILifetime['onPullDownRefresh']): void
 
-export function onReachBottom (callback: () => void): void
+export function onReachBottom (callback: WechatMiniprogram.Page.ILifetime['onReachBottom']): void
 
-export function onShareAppMessage (callback: () => void): void
+export function onShareAppMessage (callback: WechatMiniprogram.Page.ILifetime['onShareAppMessage']): void
 
-export function onShareTimeline (callback: () => void): void
+export function onShareTimeline (callback: WechatMiniprogram.Page.ILifetime['onShareTimeline']): void
 
-export function onAddToFavorites (callback: () => void): void
+export function onAddToFavorites (callback: WechatMiniprogram.Page.ILifetime['onAddToFavorites']): void
 
-export function onPageScroll (callback: () => void): void
+export function onPageScroll (callback: WechatMiniprogram.Page.ILifetime['onPageScroll']): void
 
-export function onTabItemTap (callback: () => void): void
+export function onTabItemTap (callback: WechatMiniprogram.Page.ILifetime['onTabItemTap']): void
 
 export function onSaveExitState (callback: () => void): void
 

package/package.json

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

package/src/convertor/wxToTt.js

@@ -1,5 +1,21 @@
+import { error } from '@mpxjs/utils'
+
+const BEHAVIORS_MAP = [
+  'wx://form-field',
+  'wx://form-field-group',
+  'wx://form-field-button',
+  'wx://component-export'
+]
+
 export default {
   convert (options) {
-    // 暂时无需转换
+    if (options.behaviors) {
+      options.behaviors.forEach((behavior, idx) => {
+        if (BEHAVIORS_MAP.includes(behavior)) {
+          error(`Built-in behavior "${behavior}" is not supported in tt environment!`, global.currentResource)
+          options.behaviors.splice(idx, 1)
+        }
+      })
+    }
   }
 }