Parent autoload

.gitignore

@@ -1,4 +1,3 @@
-tests_deact
 .idea
 # Byte-compiled / optimized / DLL files
 __pycache__/

src/miniflask/miniflask.py

@@ -101,10 +101,18 @@ def print_heading(self, *args, color=fg('blue'), margin=8):
         print(color + attr('bold') + line + attr('reset'))
 
     def print_recently_loaded(self, prepend="", loading_text=highlight_loading):
+        last = ""
+        last_formatted = ""
         for i, mod in enumerate(self._recently_loaded):
-            module_id = mod.miniflask_obj.module_id_initial
+            module_id = module_id_formatted = module_id = mod.miniflask_obj.module_id_initial
+
+            # if previously printed parent, make the module_id shorter
+            if module_id.startswith(last):
+                module_id_formatted = last_formatted + module_id[len(last):]
+
             is_last = i == len(self._recently_loaded) - 1
             has_children = len(mod.miniflask_obj._recently_loaded) > 0
+            part_of_next = i < len(self._recently_loaded) - 1 and self._recently_loaded[i + 1].miniflask_obj.module_id_initial.startswith(module_id)
             if is_last:
                 tree_symb         = "    "  # noqa: E221
                 tree_symb_current = "╰── "  # "└── "
@@ -114,12 +122,15 @@ def print_recently_loaded(self, prepend="", loading_text=highlight_loading):
             else:
                 tree_symb         = "│   "  # noqa: E221
                 tree_symb_current = "├── "  # "├── "
-            if prepend == "":
-                print(loading_text(module_id))
-            else:
-                print(prepend + tree_symb_current + loading_text(module_id))
+            if not part_of_next:
+                if prepend == "":
+                    print(loading_text(module_id_formatted))
+                else:
+                    print(prepend + tree_symb_current + loading_text(module_id_formatted))
             if len(mod.miniflask_obj._recently_loaded) > 0:
                 mod.miniflask_obj.print_recently_loaded(prepend + tree_symb, loading_text)
+            last = module_id
+            last_formatted = loading_text(module_id_formatted) if part_of_next else module_id
 
     # ==================== #
     # module introspection #
@@ -349,6 +360,16 @@ def load(self, module_name, verbose=True, auto_query=True, loading_text=highligh
         mod.miniflask_obj = miniflask_wrapper(module_name, self)
         mod.miniflask_obj.bind_events = bind_events
 
+        # first load all parents
+        # (starting with root parent, specializing with every step)
+        if not hasattr(mod, 'register_parents') or mod.register_parents:
+            module_path = module_name.split(".")
+            for depth in range(1, len(module_path)):
+                parent_module = ".".join(module_path[:depth])
+                if parent_module in self.modules_avail and parent_module not in self.modules_loaded:
+                    parent_as_id = None if as_id is None else ".".join(as_id.split(".")[:-1])
+                    self.load(parent_module, verbose=False, auto_query=False, loading_text=loading_text, as_id=parent_as_id, bind_events=bind_events)
+
         # remember loaded modules
         self.modules_loaded[module_name] = mod
         self._recently_loaded.append(mod)
@@ -879,7 +900,9 @@ def load(self, module_name, as_id=None, auto_query=True, **kwargs):
         auto_query = not was_relative
 
         # call load (but ensure no querying is made if relative imports were given)
-        super().load(module_name, auto_query=auto_query, verbose=False, as_id=as_id, **kwargs)
+        if "verbose" in kwargs:
+            del kwargs["verbose"]
+        super().load(module_name, verbose=False, auto_query=auto_query, as_id=as_id, **kwargs)
 
     # overwrite state defaults
     def register_event(self, name, fn, **kwargs):

tests/test_dynamic_state/miniflask

@@ -0,0 +1 @@
+../../src/miniflask

tests/test_import/modules/parentdir/module3/submodule/subsubmodule/__init__.py

@@ -0,0 +1,3 @@
+
+def register(mf):
+    mf.register_event("main", lambda: print("tests"))

tests/test_import/modules/parentdir/module3/submodule2/__init__.py

@@ -0,0 +1,3 @@
+
+def register(mf):
+    mf.register_event("main", lambda: print("tests"))

tests/test_import/modules/parentdir/module3/submodule_dir/submodule_with_folder_in_between/__init__.py

@@ -0,0 +1,4 @@
+
+
+def register(mf):
+    mf.register_event("main", lambda: print("tests"))

tests/test_import/modules/parentdir/module3/submodule_without_autoload/__init__.py

@@ -0,0 +1,7 @@
+
+
+def register(mf):
+    mf.register_event("main", lambda: print("tests"))
+
+
+register_parents = False

tests/test_import/test_parent_autoloading.py

@@ -0,0 +1,48 @@
+from pathlib import Path
+import miniflask  # noqa: E402
+
+
+def init_mf():
+    return miniflask.init(module_dirs=str(Path(__file__).parent / "modules"), debug=True)
+
+
+def test_parent_autoload_level1():
+    mf = init_mf()
+    mf.run(modules=["submodule"])
+    assert "modules.parentdir.module3.submodule" in mf.modules_loaded
+    assert "modules.parentdir.module3" in mf.modules_loaded
+    assert len(mf.modules_loaded) == 2
+
+
+def test_parent_autoload_level1_two_children():
+    mf = init_mf()
+    mf.load("submodule2")
+    mf.run(modules=["submodule"])
+    assert "modules.parentdir.module3.submodule2" in mf.modules_loaded
+    assert "modules.parentdir.module3.submodule" in mf.modules_loaded
+    assert "modules.parentdir.module3" in mf.modules_loaded
+    assert len(mf.modules_loaded) == 3
+
+
+def test_parent_autoload_skip():
+    mf = init_mf()
+    mf.run(modules=["submodule_without_autoload"])
+    assert "modules.parentdir.module3.submodule_without_autoload" in mf.modules_loaded
+    assert len(mf.modules_loaded) == 1
+
+
+def test_parent_autoload_level2():
+    mf = init_mf()
+    mf.run(modules=["subsubmodule"])
+    assert "modules.parentdir.module3.submodule.subsubmodule" in mf.modules_loaded
+    assert "modules.parentdir.module3.submodule" in mf.modules_loaded
+    assert "modules.parentdir.module3" in mf.modules_loaded
+    assert len(mf.modules_loaded) == 3
+
+
+def test_parent_autoload_level2_with_folder_in_between():
+    mf = init_mf()
+    mf.run(modules=["submodule_with_folder_in_between"])
+    assert "modules.parentdir.module3.submodule_dir.submodule_with_folder_in_between" in mf.modules_loaded
+    assert "modules.parentdir.module3" in mf.modules_loaded
+    assert len(mf.modules_loaded) == 3

tests/test_import/test_relative_import.py

@@ -17,8 +17,9 @@ def test_passive_submodule_import():
 def test_active_submodule_import():
     mf = init_mf()
     mf.run(argv=[], modules=["submodule"])
+    assert "modules.parentdir.module3" in mf.modules_loaded
     assert "modules.parentdir.module3.submodule" in mf.modules_loaded
-    assert len(mf.modules_loaded) == 1
+    assert len(mf.modules_loaded) == 2
 
 
 def test_relative_import():