Revert "fix(adapter): init types"

This reverts commit 0ee8b41.
wechat-miniprogram · Jul 10, 2024 · 09be373 · 09be373
1 parent 0ee8b41
commit 09be373
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/glass-easel-miniprogram-adapter/src/builder/base_behavior_builder.ts b/glass-easel-miniprogram-adapter/src/builder/base_behavior_builder.ts
@@ -23,7 +23,6 @@ type MethodList = typeUtils.MethodList
 type ChainingFilterType = typeUtils.ChainingFilterType
 type ComponentMethod = typeUtils.ComponentMethod
 type TaggedMethod<Fn extends ComponentMethod> = typeUtils.TaggedMethod<Fn>
-type UnTaggedMethod<M extends TaggedMethod<any>> = typeUtils.UnTaggedMethod<M>
 
 export class BaseBehaviorBuilder<
   TPrevData extends DataList = Empty,
@@ -261,12 +260,7 @@ export class BaseBehaviorBuilder<
       TPrevData,
       TData,
       TProperty,
-      TMethod &
-        (TExport extends void
-          ? Empty
-          : {
-              [K in keyof TExport]: UnTaggedMethod<TExport[K]>
-            }),
+      TMethod,
       TChainingFilter,
       TPendingChainingFilter,
       TComponentExport,

diff --git a/glass-easel-miniprogram-adapter/src/builder/behavior_builder.ts b/glass-easel-miniprogram-adapter/src/builder/behavior_builder.ts
@@ -17,7 +17,6 @@ type MethodList = typeUtils.MethodList
 type ChainingFilterType = typeUtils.ChainingFilterType
 type ComponentMethod = typeUtils.ComponentMethod
 type TaggedMethod<Fn extends ComponentMethod> = typeUtils.TaggedMethod<Fn>
-type UnTaggedMethod<M extends TaggedMethod<any>> = typeUtils.UnTaggedMethod<M>
 type ChainingFilterFunc<
   TAddedFields extends { [key: string]: any },
   TRemovedFields extends string = never,
@@ -218,12 +217,7 @@ export class BehaviorBuilder<
       TPrevData,
       TData,
       TProperty,
-      TMethod &
-        (TExport extends void
-          ? Empty
-          : {
-              [K in keyof TExport]: UnTaggedMethod<TExport[K]>
-            }),
+      TMethod,
       TChainingFilter,
       TPendingChainingFilter,
       TComponentExport,

diff --git a/glass-easel-miniprogram-adapter/src/builder/component_builder.ts b/glass-easel-miniprogram-adapter/src/builder/component_builder.ts
@@ -24,7 +24,6 @@ type MethodList = typeUtils.MethodList
 type ChainingFilterType = typeUtils.ChainingFilterType
 type ComponentMethod = typeUtils.ComponentMethod
 type TaggedMethod<Fn extends ComponentMethod> = typeUtils.TaggedMethod<Fn>
-type UnTaggedMethod<M extends TaggedMethod<any>> = typeUtils.UnTaggedMethod<M>
 
 /**
  * A direct way to create a component
@@ -242,12 +241,7 @@ export class ComponentBuilder<
       TPrevData,
       TData,
       TProperty,
-      TMethod &
-        (TExport extends void
-          ? Empty
-          : {
-              [K in keyof TExport]: UnTaggedMethod<TExport[K]>
-            }),
+      TMethod,
       TChainingFilter,
       TPendingChainingFilter,
       TComponentExport,