@@ -2261,7 +2261,9 @@ def _get_hook_deps(hook: str) -> list[str]:
22612261 return [var_name ]
22622262
22632263 @staticmethod
2264- def _get_deps_from_event_trigger (event : EventChain | EventSpec | Var ) -> set [str ]:
2264+ def _get_deps_from_event_trigger (
2265+ event : EventChain | EventSpec | Var ,
2266+ ) -> dict [str , None ]:
22652267 """Get the dependencies accessed by event triggers.
22662268
22672269 Args:
@@ -2271,7 +2273,7 @@ def _get_deps_from_event_trigger(event: EventChain | EventSpec | Var) -> set[str
22712273 The dependencies accessed by the event triggers.
22722274 """
22732275 events : list = [event ]
2274- deps = set ()
2276+ deps = {}
22752277
22762278 if isinstance (event , EventChain ):
22772279 events .extend (event .events )
@@ -2282,7 +2284,7 @@ def _get_deps_from_event_trigger(event: EventChain | EventSpec | Var) -> set[str
22822284 for a in arg :
22832285 var_datas = VarData .merge (a ._get_all_var_data ())
22842286 if var_datas and var_datas .deps is not None :
2285- deps |= {str (dep ) for dep in var_datas .deps }
2287+ deps |= {str (dep ): None for dep in var_datas .deps }
22862288 return deps
22872289
22882290 @classmethod
@@ -2499,27 +2501,23 @@ def empty_component() -> Component:
24992501 return Bare .create ("" )
25002502
25012503
2502- def render_dict_to_var (tag : dict | Component | str , imported_names : set [ str ] ) -> Var :
2504+ def render_dict_to_var (tag : dict | Component | str ) -> Var :
25032505 """Convert a render dict to a Var.
25042506
25052507 Args:
25062508 tag: The render dict.
2507- imported_names: The names of the imported components.
25082509
25092510 Returns:
25102511 The Var.
25112512 """
25122513 if not isinstance (tag , dict ):
25132514 if isinstance (tag , Component ):
2514- return render_dict_to_var (tag .render (), imported_names )
2515+ return render_dict_to_var (tag .render ())
25152516 return Var .create (tag )
25162517
25172518 if "iterable" in tag :
25182519 function_return = LiteralArrayVar .create (
2519- [
2520- render_dict_to_var (child .render (), imported_names )
2521- for child in tag ["children" ]
2522- ]
2520+ [render_dict_to_var (child .render ()) for child in tag ["children" ]]
25232521 )
25242522
25252523 func = ArgsFunctionOperation .create (
@@ -2537,7 +2535,7 @@ def render_dict_to_var(tag: dict | Component | str, imported_names: set[str]) ->
25372535 if tag ["name" ] == "match" :
25382536 element = tag ["cond" ]
25392537
2540- conditionals = render_dict_to_var (tag ["default" ], imported_names )
2538+ conditionals = render_dict_to_var (tag ["default" ])
25412539
25422540 for case in tag ["match_cases" ][::- 1 ]:
25432541 condition = case [0 ].to_string () == element .to_string ()
@@ -2546,7 +2544,7 @@ def render_dict_to_var(tag: dict | Component | str, imported_names: set[str]) ->
25462544
25472545 conditionals = ternary_operation (
25482546 condition ,
2549- render_dict_to_var (case [- 1 ], imported_names ),
2547+ render_dict_to_var (case [- 1 ]),
25502548 conditionals ,
25512549 )
25522550
@@ -2555,8 +2553,8 @@ def render_dict_to_var(tag: dict | Component | str, imported_names: set[str]) ->
25552553 if "cond" in tag :
25562554 return ternary_operation (
25572555 tag ["cond" ],
2558- render_dict_to_var (tag ["true_value" ], imported_names ),
2559- render_dict_to_var (tag ["false_value" ], imported_names )
2556+ render_dict_to_var (tag ["true_value" ]),
2557+ render_dict_to_var (tag ["false_value" ])
25602558 if tag ["false_value" ] is not None
25612559 else LiteralNoneVar .create (),
25622560 )
@@ -2574,7 +2572,7 @@ def render_dict_to_var(tag: dict | Component | str, imported_names: set[str]) ->
25742572 tag_name ,
25752573 props ,
25762574 * ([Var (contents )] if contents is not None else []),
2577- * [render_dict_to_var (child , imported_names ) for child in tag ["children" ]],
2575+ * [render_dict_to_var (child ) for child in tag ["children" ]],
25782576 )
25792577
25802578
@@ -2595,13 +2593,7 @@ def _cached_var_name(self) -> str:
25952593 Returns:
25962594 The name of the var.
25972595 """
2598- var_data = self ._get_all_var_data ()
2599- if var_data is not None :
2600- # flatten imports
2601- imported_names = {j .alias or j .name for i in var_data .imports for j in i [1 ]}
2602- else :
2603- imported_names = set ()
2604- return str (render_dict_to_var (self ._var_value .render (), imported_names ))
2596+ return str (render_dict_to_var (self ._var_value .render ()))
26052597
26062598 @cached_property_no_lock
26072599 def _cached_get_all_var_data (self ) -> VarData | None :
0 commit comments