33from python_minifier .transforms .suite_transformer import SuiteTransformer
44
55
6+ def import_kwargs (import_node ):
7+ lazy = getattr (import_node , 'is_lazy' , None )
8+ if lazy is None :
9+ return {}
10+ return {'is_lazy' : lazy }
11+
12+
613class CombineImports (SuiteTransformer ):
714 """
815 Combine multiple import statements where possible
@@ -13,29 +20,49 @@ class CombineImports(SuiteTransformer):
1320
1421 def _combine_import (self , node_list , parent ):
1522
23+ prev_import = None
1624 alias = []
17- namespace = None
25+
26+ def can_merge_with_previous_group (statement ):
27+ if not isinstance (statement , ast .Import ):
28+ return False
29+
30+ if prev_import is None :
31+ return True
32+
33+ if getattr (statement , 'is_lazy' , None ) != getattr (prev_import , 'is_lazy' , None ):
34+ return False
35+
36+ return True
37+
38+ def can_create_group (statement ):
39+ return isinstance (statement , ast .Import )
1840
1941 for statement in node_list :
20- namespace = statement . namespace
21- if isinstance ( statement , ast . Import ):
42+ if can_merge_with_previous_group ( statement ):
43+ prev_import = statement
2244 alias += statement .names
2345 else :
2446 if alias :
25- yield self .add_child (ast .Import (names = alias ), parent = parent , namespace = namespace )
47+ yield self .add_child (ast .Import (names = alias , ** import_kwargs (prev_import )), parent = parent , namespace = prev_import .namespace )
48+ prev_import = None
2649 alias = []
2750
28- yield statement
51+ if can_create_group (statement ):
52+ prev_import = statement
53+ alias += statement .names
54+ else :
55+ yield statement
2956
3057 if alias :
31- yield self .add_child (ast .Import (names = alias ) , parent = parent , namespace = namespace )
58+ yield self .add_child (ast .Import (names = alias , ** import_kwargs ( prev_import )) , parent = parent , namespace = prev_import . namespace )
3259
3360 def _combine_import_from (self , node_list , parent ):
3461
3562 prev_import = None
3663 alias = []
3764
38- def combine (statement ):
65+ def can_merge_with_previous_group (statement ):
3966 if not isinstance (statement , ast .ImportFrom ):
4067 return False
4168
@@ -45,27 +72,44 @@ def combine(statement):
4572 if prev_import is None :
4673 return True
4774
75+ if getattr (statement , 'is_lazy' , None ) != getattr (prev_import , 'is_lazy' , None ):
76+ return False
77+
4878 if statement .module == prev_import .module and statement .level == prev_import .level :
4979 return True
5080
5181 return False
5282
83+ def can_create_group (statement ):
84+ if not isinstance (statement , ast .ImportFrom ):
85+ return False
86+
87+ if len (statement .names ) == 1 and statement .names [0 ].name == '*' :
88+ return False
89+
90+ return True
91+
5392 for statement in node_list :
54- if combine (statement ):
93+ if can_merge_with_previous_group (statement ):
5594 prev_import = statement
5695 alias += statement .names
5796 else :
5897 if alias :
5998 yield self .add_child (
60- ast .ImportFrom (module = prev_import .module , names = alias , level = prev_import .level ), parent = parent , namespace = prev_import .namespace
99+ ast .ImportFrom (module = prev_import .module , names = alias , level = prev_import .level , ** import_kwargs ( prev_import ) ), parent = parent , namespace = prev_import .namespace
61100 )
101+ prev_import = None
62102 alias = []
63103
64- yield statement
104+ if can_create_group (statement ):
105+ prev_import = statement
106+ alias += statement .names
107+ else :
108+ yield statement
65109
66110 if alias :
67111 yield self .add_child (
68- ast .ImportFrom (module = prev_import .module , names = alias , level = prev_import .level ), parent = parent , namespace = prev_import .namespace
112+ ast .ImportFrom (module = prev_import .module , names = alias , level = prev_import .level , ** import_kwargs ( prev_import ) ), parent = parent , namespace = prev_import .namespace
69113 )
70114
71115 def suite (self , node_list , parent ):
0 commit comments