@@ -2547,7 +2547,9 @@ def _get_hook_deps(hook: str) -> list[str]:
25472547 return [var_name ]
25482548
25492549 @staticmethod
2550- def _get_deps_from_event_trigger (event : EventChain | EventSpec | Var ) -> set [str ]:
2550+ def _get_deps_from_event_trigger (
2551+ event : EventChain | EventSpec | Var ,
2552+ ) -> dict [str , None ]:
25512553 """Get the dependencies accessed by event triggers.
25522554
25532555 Args:
@@ -2557,7 +2559,7 @@ def _get_deps_from_event_trigger(event: EventChain | EventSpec | Var) -> set[str
25572559 The dependencies accessed by the event triggers.
25582560 """
25592561 events : list = [event ]
2560- deps = set ()
2562+ deps = {}
25612563
25622564 if isinstance (event , EventChain ):
25632565 events .extend (event .events )
@@ -2568,7 +2570,7 @@ def _get_deps_from_event_trigger(event: EventChain | EventSpec | Var) -> set[str
25682570 for a in arg :
25692571 var_datas = VarData .merge (a ._get_all_var_data ())
25702572 if var_datas and var_datas .deps is not None :
2571- deps |= {str (dep ) for dep in var_datas .deps }
2573+ deps |= {str (dep ): None for dep in var_datas .deps }
25722574 return deps
25732575
25742576 @classmethod
@@ -2785,27 +2787,23 @@ def empty_component() -> Component:
27852787 return Bare .create ("" )
27862788
27872789
2788- def render_dict_to_var (tag : dict | Component | str , imported_names : set [ str ] ) -> Var :
2790+ def render_dict_to_var (tag : dict | Component | str ) -> Var :
27892791 """Convert a render dict to a Var.
27902792
27912793 Args:
27922794 tag: The render dict.
2793- imported_names: The names of the imported components.
27942795
27952796 Returns:
27962797 The Var.
27972798 """
27982799 if not isinstance (tag , dict ):
27992800 if isinstance (tag , Component ):
2800- return render_dict_to_var (tag .render (), imported_names )
2801+ return render_dict_to_var (tag .render ())
28012802 return Var .create (tag )
28022803
28032804 if "iterable" in tag :
28042805 function_return = LiteralArrayVar .create (
2805- [
2806- render_dict_to_var (child .render (), imported_names )
2807- for child in tag ["children" ]
2808- ]
2806+ [render_dict_to_var (child .render ()) for child in tag ["children" ]]
28092807 )
28102808
28112809 func = ArgsFunctionOperation .create (
@@ -2823,7 +2821,7 @@ def render_dict_to_var(tag: dict | Component | str, imported_names: set[str]) ->
28232821 if tag ["name" ] == "match" :
28242822 element = tag ["cond" ]
28252823
2826- conditionals = render_dict_to_var (tag ["default" ], imported_names )
2824+ conditionals = render_dict_to_var (tag ["default" ])
28272825
28282826 for case in tag ["match_cases" ][::- 1 ]:
28292827 condition = case [0 ].to_string () == element .to_string ()
@@ -2832,7 +2830,7 @@ def render_dict_to_var(tag: dict | Component | str, imported_names: set[str]) ->
28322830
28332831 conditionals = ternary_operation (
28342832 condition ,
2835- render_dict_to_var (case [- 1 ], imported_names ),
2833+ render_dict_to_var (case [- 1 ]),
28362834 conditionals ,
28372835 )
28382836
@@ -2841,8 +2839,8 @@ def render_dict_to_var(tag: dict | Component | str, imported_names: set[str]) ->
28412839 if "cond" in tag :
28422840 return ternary_operation (
28432841 tag ["cond" ],
2844- render_dict_to_var (tag ["true_value" ], imported_names ),
2845- render_dict_to_var (tag ["false_value" ], imported_names )
2842+ render_dict_to_var (tag ["true_value" ]),
2843+ render_dict_to_var (tag ["false_value" ])
28462844 if tag ["false_value" ] is not None
28472845 else LiteralNoneVar .create (),
28482846 )
@@ -2860,7 +2858,7 @@ def render_dict_to_var(tag: dict | Component | str, imported_names: set[str]) ->
28602858 tag_name ,
28612859 props ,
28622860 * ([Var (contents )] if contents is not None else []),
2863- * [render_dict_to_var (child , imported_names ) for child in tag ["children" ]],
2861+ * [render_dict_to_var (child ) for child in tag ["children" ]],
28642862 )
28652863
28662864
@@ -2881,13 +2879,7 @@ def _cached_var_name(self) -> str:
28812879 Returns:
28822880 The name of the var.
28832881 """
2884- var_data = self ._get_all_var_data ()
2885- if var_data is not None :
2886- # flatten imports
2887- imported_names = {j .alias or j .name for i in var_data .imports for j in i [1 ]}
2888- else :
2889- imported_names = set ()
2890- return str (render_dict_to_var (self ._var_value .render (), imported_names ))
2882+ return str (render_dict_to_var (self ._var_value .render ()))
28912883
28922884 @cached_property_no_lock
28932885 def _cached_get_all_var_data (self ) -> VarData | None :
0 commit comments