From 21d29951a484ed0197d1bd226184691f408fa6ad Mon Sep 17 00:00:00 2001
From: chyizheng <chyizheng@tencent.com>
Date: Mon, 22 Jan 2024 20:23:15 +0800
Subject: [PATCH] fix: fix adapter typing

---
 glass-easel-miniprogram-adapter/src/builder/type_utils.ts | 2 +-
 glass-easel-miniprogram-adapter/src/component.ts          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/glass-easel-miniprogram-adapter/src/builder/type_utils.ts b/glass-easel-miniprogram-adapter/src/builder/type_utils.ts
index d56c5019..2989c491 100644
--- 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
index e14cddc9..32d820b7 100644
--- 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>) {