feat: 优化实现

Author: lv-z-l

test/behavior.test.ts

@@ -1,10 +1,6 @@
 import { expectType } from 'tsd'
 
-expectType<{
-  data: {}
-  properties: {}
-  methods: {}
-}>(Behavior({}))
+expectType<string & { BehaviorType: { data: {}, properties: {}, methods: {} } }>(Behavior({}))
 
 Behavior({
   behaviors: [],

test/component.test.ts

@@ -3,7 +3,7 @@ import { expectType, expectError } from 'tsd'
 expectType<string>(Component({}))
 
 Component({
-  behaviors: [{data: {}, properties: {}, methods: {}}],
+  behaviors: [],
 
   properties: {
     myProperty: {

test/issue.test.ts

@@ -285,11 +285,7 @@ import WX = WechatMiniprogram
   type IMethod = {
     setJob(job: string): void
   }
-  type IBehavior = [{
-    data: {}
-    properties: {}
-    methods: {}
-  }]
+  type IBehavior = []
   type ICustomInstanceProperty = {
     job: string
   }

types/wx/lib.wx.behavior.d.ts

@@ -25,10 +25,12 @@ declare namespace WechatMiniprogram.Behavior {
         TData extends DataOption = {},
         TProperty extends PropertyOption = {},
         TMethod extends MethodOption = {}
-    > = {
-        data: TData
-        properties: TProperty
-        methods: TMethod
+    > = string & {
+        BehaviorType: {
+            data: TData
+            properties: TProperty
+            methods: TMethod
+        }
     }
     type Instance<
         TData extends DataOption,

types/wx/lib.wx.component.d.ts

@@ -97,15 +97,15 @@ declare namespace WechatMiniprogram.Component {
     type PropertyOption = Record<string, AllProperty>
     type MethodOption = Record<string, Function>
 
-
     type BehaviorOption = Behavior.BehaviorIdentifier[]
+    type ExtractBehaviorType<T> = T extends { BehaviorType: infer B } ? B : never
     type ExtractData<T> = T extends { data: infer D } ? D : never
     type ExtractProperties<T> = T extends { properties: infer P } ? PropertyOptionToData<P extends PropertyOption ? P : {}> : never
     type ExtractMethods<T> = T extends { methods: infer M } ? M : never
     type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never
-    type MixinData<T extends any[]> = UnionToIntersection<ExtractData<T[number]>>
-    type MixinProperties<T extends any[]> = UnionToIntersection<ExtractProperties<T[number]>>
-    type MixinMethods<T extends any[]> = UnionToIntersection<ExtractMethods<T[number]>>
+    type MixinData<T extends any[]> = UnionToIntersection<ExtractData<ExtractBehaviorType<T[number]>>>
+    type MixinProperties<T extends any[]> = UnionToIntersection<ExtractProperties<ExtractBehaviorType<T[number]>>>
+    type MixinMethods<T extends any[]> = UnionToIntersection<ExtractMethods<ExtractBehaviorType<T[number]>>>
 
     interface Behavior<B extends BehaviorOption> {
         /** 类似于mixins和traits的组件间代码复用机制，参见 [behaviors](https://developers.weixin.qq.com/miniprogram/dev/framework/custom-component/behaviors.html) */