feat: optimize the implementation of behavior type inference

wechat-miniprogram · Sep 5, 2024 · 5e6a22b · 5e6a22b
1 parent 3af2210
commit 5e6a22b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/test/behavior.test.ts b/test/behavior.test.ts
@@ -1,6 +1,6 @@
 import { expectType } from 'tsd'
 
-expectType<string & { BehaviorType: { data: {}, properties: {}, methods: {} } }>(Behavior({}))
+expectType<string & {}>(Behavior({}))
 
 Behavior({
   behaviors: [],

diff --git a/test/component.test.ts b/test/component.test.ts
@@ -3,7 +3,7 @@ import { expectType, expectError } from 'tsd'
 expectType<string>(Component({}))
 
 Component({
-  behaviors: [],
+  behaviors: [''],
 
   properties: {
     myProperty: {

diff --git a/types/wx/lib.wx.behavior.d.ts b/types/wx/lib.wx.behavior.d.ts
@@ -21,17 +21,18 @@ SOFTWARE.
 ***************************************************************************** */
 
 declare namespace WechatMiniprogram.Behavior {
-    type BehaviorIdentifier<
+    type RealBehaviorType<
         TData extends DataOption = {},
         TProperty extends PropertyOption = {},
         TMethod extends MethodOption = {}
-    > = string & {
-        BehaviorType: {
+    > = {
+        [key in 'BehaviorType']?: {
             data: TData
             properties: TProperty
             methods: TMethod
         }
     }
+    type BehaviorIdentifier = string
     type Instance<
         TData extends DataOption,
         TProperty extends PropertyOption,
@@ -59,7 +60,7 @@ declare namespace WechatMiniprogram.Behavior {
             TCustomInstanceProperty extends IAnyObject = Record<string, never>
         >(
             options: Options<TData, TProperty, TMethod, TCustomInstanceProperty>
-        ): BehaviorIdentifier<TData, TProperty, TMethod>
+        ): BehaviorIdentifier & RealBehaviorType<TData, TProperty, TMethod>
     }
 
     type DataOption = Component.DataOption

diff --git a/types/wx/lib.wx.component.d.ts b/types/wx/lib.wx.component.d.ts
@@ -98,7 +98,7 @@ declare namespace WechatMiniprogram.Component {
     type MethodOption = Record<string, Function>
 
     type BehaviorOption = Behavior.BehaviorIdentifier[]
-    type ExtractBehaviorType<T> = T extends { BehaviorType: infer B } ? B : never
+    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