fix: fix adapter typing

wechat-miniprogram · Jan 22, 2024 · 21d2995 · 21d2995
1 parent f320d72
commit 21d2995
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/glass-easel-miniprogram-adapter/src/builder/type_utils.ts b/glass-easel-miniprogram-adapter/src/builder/type_utils.ts
@@ -55,7 +55,7 @@ export interface BuilderContext<
   TMethodCaller,
 > extends ThisType<TMethodCaller> {
   self: TMethodCaller
-  data: typeUtils.DataWithPropertyValues<TPrevData, TProperty>
+  data: typeUtils.Merge<typeUtils.DataWithPropertyValues<TPrevData, TProperty>>
   setData: (newData: Partial<typeUtils.SetDataSetter<TPrevData>>, callback?: () => void) => void
   implement: <TIn extends { [x: string]: any }>(
     traitBehavior: TraitBehavior<TIn, any>,

diff --git a/glass-easel-miniprogram-adapter/src/component.ts b/glass-easel-miniprogram-adapter/src/component.ts
@@ -131,7 +131,7 @@ export class ComponentCaller<
   }
 
   /** The component data and property values */
-  get data(): AllData<TData, TProperty> {
+  get data(): typeUtils.Merge<AllData<TData, TProperty>> {
     return this._$.data
   }
   set data(value: AllData<TData, TProperty>) {
@@ -144,7 +144,7 @@ export class ComponentCaller<
   }
 
   /** The component data and property values (same as `data` ) */
-  get properties(): AllData<TData, TProperty> {
+  get properties(): typeUtils.Merge<AllData<TData, TProperty>> {
     return this._$.data
   }
   set properties(value: AllData<TData, TProperty>) {