Merge pull request #190 from wechat-miniprogram/fix-adapter-chaining-…

…filter fix(miniprogram-adapter): chaining filter should work on the adapter chain
wechat-miniprogram · Aug 15, 2024 · b9544cb · b9544cb
2 parents e2ddc2e + 18f73e2
commit b9544cb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/glass-easel-miniprogram-adapter/src/behavior.ts b/glass-easel-miniprogram-adapter/src/behavior.ts
@@ -32,6 +32,8 @@ export class Behavior<
   /** @internal */
   _$: glassEasel.GeneralBehavior
   /** @internal */
+  _$chainingFilter?: typeUtils.ChainingFilterFunc<any, any>
+  /** @internal */
   _$bindedDefinitionFilter?: (target: GeneralComponentDefinition) => void
   /** @internal */
   _$export?: (source: GeneralComponent | null) => TComponentExport
@@ -41,9 +43,11 @@ export class Behavior<
     inner: glassEasel.Behavior<TData, TProperty, TMethod, TChainingFilter, TExtraThisFields>,
     parents: GeneralBehavior[],
     definitionFilter: DefinitionFilter | undefined,
+    chainingFilter: typeUtils.ChainingFilterFunc<any, any> | undefined,
     componentExport: ((source: GeneralComponent | null) => TComponentExport) | undefined,
   ) {
     this._$ = inner as glassEasel.GeneralBehavior
+    this._$chainingFilter = chainingFilter
     this._$export = componentExport
 
     // processing definition filter

diff --git a/glass-easel-miniprogram-adapter/src/builder/behavior_builder.ts b/glass-easel-miniprogram-adapter/src/builder/behavior_builder.ts
@@ -43,6 +43,7 @@ export class BehaviorBuilder<
   TExtraThisFields
 > {
   private _$definitionFilter: DefinitionFilter | undefined
+  private _$chainingFilter?: ChainingFilterFunc<any, any>
 
   /** @internal */
   static create(codeSpace: CodeSpace): BehaviorBuilder {
@@ -74,7 +75,7 @@ export class BehaviorBuilder<
     >,
     TChainingFilter
   > {
-    this._$.chainingFilter(func as any)
+    this._$chainingFilter = func
     return this as any
   }
 
@@ -103,6 +104,9 @@ export class BehaviorBuilder<
     this._$parents.push(behavior as GeneralBehavior)
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     this._$ = this._$.behavior(behavior._$)
+    if (behavior._$chainingFilter) {
+      return behavior._$chainingFilter(this as any)
+    }
     return this as any
   }
 
@@ -284,6 +288,7 @@ export class BehaviorBuilder<
       this._$.registerBehavior(),
       this._$parents,
       this._$definitionFilter,
+      this._$chainingFilter,
       this._$export,
     )
   }

diff --git a/glass-easel-miniprogram-adapter/src/builder/component_builder.ts b/glass-easel-miniprogram-adapter/src/builder/component_builder.ts
@@ -125,6 +125,9 @@ export class ComponentBuilder<
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
       this._$export = behavior._$export as any
     }
+    if (behavior._$chainingFilter) {
+      return behavior._$chainingFilter(this as any)
+    }
     return this as any
   }
 

diff --git a/glass-easel-miniprogram-adapter/tests/space.test.ts b/glass-easel-miniprogram-adapter/tests/space.test.ts
@@ -753,7 +753,7 @@ describe('define', () => {
       .chainingFilter<TAdd, TRemove>((chain) => {
         const oldData = chain.data.bind(chain)
         const newData = function () {
-          oldData(() => ({
+          return oldData(() => ({
             a: 123,
           }))
         }