@@ -1643,40 +1643,40 @@ def _get_imports(self) -> ParsedImportDict:
16431643 Returns:
16441644 The imports needed by the component.
16451645 """
1646- _imports = {}
1647-
1648- # Import this component's tag from the main library.
1649- if self . library is not None and self . tag is not None :
1650- _imports [ self . library ] = self . import_var
1646+ _imports = (
1647+ { self . library : [ self . import_var ]}
1648+ if self . library is not None and self . tag is not None
1649+ else {}
1650+ )
16511651
16521652 # Get static imports required for event processing.
16531653 event_imports = Imports .EVENTS if self .event_triggers else {}
16541654
16551655 # Collect imports from Vars used directly by this component.
1656- var_imports = [
1657- var_data .imports
1658- for var in self ._get_vars ()
1659- if (var_data := var ._get_all_var_data ()) is not None
1660- ]
1656+ var_imports = imports .merge_imports (
1657+ * [
1658+ var_data .imports
1659+ for var in self ._get_vars ()
1660+ if (var_data := var ._get_all_var_data ()) is not None
1661+ ]
1662+ )
16611663
1662- added_import_dicts : list [ParsedImportDict ] = []
1664+ added_import_dicts : list [ImportDict ] = []
16631665 for clz in self ._iter_parent_classes_with_method ("add_imports" ):
16641666 list_of_import_dict = clz .add_imports (self )
16651667
16661668 if not isinstance (list_of_import_dict , list ):
1667- list_of_import_dict = [list_of_import_dict ]
1668-
1669- added_import_dicts .extend (
1670- [parse_imports (import_dict ) for import_dict in list_of_import_dict ]
1671- )
1669+ added_import_dicts .append (list_of_import_dict )
1670+ else :
1671+ added_import_dicts .extend (list_of_import_dict )
16721672
1673- return imports .merge_imports (
1673+ return imports .merge_parsed_imports (
16741674 self ._get_dependencies_imports (),
16751675 self ._get_hooks_imports (),
16761676 {** _imports },
16771677 event_imports ,
1678- * var_imports ,
1679- * added_import_dicts ,
1678+ var_imports ,
1679+ parse_imports ( * added_import_dicts ) ,
16801680 )
16811681
16821682 def _get_all_imports (self , collapse : bool = False ) -> ParsedImportDict :
0 commit comments