fixed module template filters and global variables and fixed reflector get_all computation

Author: eadwinCode

ellar/core/modules/base.py

@@ -20,7 +20,7 @@ def __init__(cls, name, bases, namespace) -> None:
         cls.__MODULE_FIELDS__: t.Dict = {}
 
         for base in reversed(bases):
-            ModuleBaseBuilder(cls).build(getattr(base, MODULE_FIELDS, {}))
+            ModuleBaseBuilder(cls).build(getattr(base, MODULE_FIELDS, base.__dict__))
         ModuleBaseBuilder(cls).build(namespace)
 
 

ellar/core/services/reflector.py

@@ -32,7 +32,11 @@ def get_all_and_merge(
             return []
 
         if len(metadata_collection) == 1:
-            return [metadata_collection[0]]
+            content = metadata_collection[0]
+            if isinstance(content, (list, tuple, set, dict)):
+                return content
+
+            return [content]
 
         @t.no_type_check
         def inline_function(previous_item: t.Any, next_item: t.Any) -> t.Any:

tests/test_reflector.py

@@ -25,6 +25,30 @@ def test_should_return_an_empty_array_when_there_are_no_targets():
     assert reflector.get_all_and_merge(key, *[]) == []
 
 
+def test_should_original_dict_type_if_one_item_is_found():
+    key = "key"
+    value = {"key": "value"}
+
+    reflect.define_metadata(key, value, SampleTarget)
+    assert reflector.get_all_and_merge(key, *[SampleTarget]) == value
+
+
+def test_should_original_list_type_if_one_item_is_found():
+    key = "key"
+    value = {"key": "value"}
+
+    reflect.define_metadata(key, [value], SampleTarget)
+    assert reflector.get_all_and_merge(key, *[SampleTarget]) == [value]
+
+
+def test_should_original_str_if_one_item_is_found():
+    key = "key"
+    value = "value"
+
+    reflect.define_metadata(key, value, SampleTarget)
+    assert reflector.get_all_and_merge(key, *[SampleTarget]) == [value]
+
+
 def test_should_reflect_metadata_of_all_targets_and_concat_arrays():
     key = "key"
     value = "value"

tests/test_templating/test_module_templating.py

@@ -9,8 +9,7 @@
 from jinja2 import Environment
 
 
-@Module(template_folder="views")
-class SomeModule(ModuleBase):
+class SomeModuleMixin:
     @template_global("dec_global")
     def double_global_dec(cls, n):
         return n * 2
@@ -24,6 +23,11 @@ def double_global_dec_2(cls, n):
         return n * 2
 
 
+@Module(template_folder="views")
+class SomeModule(ModuleBase, SomeModuleMixin):
+    pass
+
+
 @Module(
     static_folder="module_statics",
 )