@@ -329,17 +329,23 @@ class HookMap:
329329 end : List [Union [Hook , dict ]]
330330 pre : List [Union [Hook , dict ]]
331331 post : List [Union [Hook , dict ]]
332+ pre_merge : List [Union [Hook , dict ]]
333+ post_merge : List [Union [Hook , dict ]]
332334
333335 def __init__ (self ,
334336 start : List [Union [Hook , dict ]] = None ,
335337 end : List [Union [Hook , dict ]] = None ,
336338 pre : List [Union [Hook , dict ]] = None ,
337339 post : List [Union [Hook , dict ]] = None ,
340+ pre_merge : List [Union [Hook , dict ]] = None ,
341+ post_merge : List [Union [Hook , dict ]] = None ,
338342 ) -> None :
339343 self .start = start or []
340344 self .end = end or []
341345 self .pre = pre or []
342346 self .post = post or []
347+ self .pre_merge = pre_merge or []
348+ self .post_merge = post_merge or []
343349
344350 def to_dict (self ) -> dict :
345351 """Convert HookMap to dictionary for serialization"""
@@ -352,6 +358,10 @@ def to_dict(self) -> dict:
352358 result ['pre' ] = hooks_to_dict (self .pre )
353359 if self .post :
354360 result ['post' ] = hooks_to_dict (self .post )
361+ if self .pre_merge :
362+ result ['pre_merge' ] = hooks_to_dict (self .pre_merge )
363+ if self .post_merge :
364+ result ['post_merge' ] = hooks_to_dict (self .post_merge )
355365 return result
356366
357367# Step aliases for all hook classes
0 commit comments