pybricksdev.compile: fix multi-file compile of __init__.py files

Add additional searches for package __init__.py files when compiling
multi-file projects.

This was missed in the original implementation of import lookup using
mpy-tool.

Fixes: #131

Author: dlech

CHANGELOG.md

@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Removed debug print statements in `pybricksdev.compile.compile_multi_file()`.
+- Fixed `__init__.py` files in packages not being included when compiling multi-file projects ([pybricksdev#131]).
+
+[pybricksdev#131]: https://github.com/pybricks/pybricksdev/issues/131
 
 ## [2.3.1] - 2026-01-18
 

pybricksdev/compile.py

@@ -180,10 +180,20 @@ async def _compile_module_and_get_imports(
     """
     with TemporaryDirectory() as temp_dir:
         module_path = os.path.join(*module_name.split(".")) + ".py"
+        package_path = os.path.join(*module_name.split("."), "__init__.py")
 
         # TODO: check for pre-compiled .mpy file first?
 
-        mpy = await compile_file(proj_dir, module_path, abi)
+        if os.path.exists(os.path.join(proj_dir, module_path)):
+            src_path = module_path
+        elif os.path.exists(os.path.join(proj_dir, package_path)):
+            src_path = package_path
+        else:
+            raise FileNotFoundError(
+                f"Module {module_name} not found. Searched for {module_path} and {package_path}."
+            )
+
+        mpy = await compile_file(proj_dir, src_path, abi)
 
         mpy_path = os.path.join(temp_dir, TMP_MPY_SCRIPT)
 

tests/test_compile.py

@@ -74,6 +74,8 @@ async def test_compile_multi_file(abi: int):
                     "import test1\n",
                     "from test2 import thing2\n",
                     "from nested.test3 import thing3\n",
+                    "from test4 import thing4\n",
+                    "from nested.test5 import thing5\n",
                 ]
             )
 
@@ -101,6 +103,24 @@ async def test_compile_multi_file(abi: int):
         ) as f3:
             f3.write("thing3 = 'thing3'\n")
 
+        # test4 and test5 are to test package modules with non-empty __init__.py
+
+        os.mkdir("test4")
+
+        with open(
+            os.path.join(temp_dir, "test4", "__init__.py"), "w", encoding="utf-8"
+        ) as f4:
+            f4.write("thing4 = 'thing4'\n")
+
+        os.mkdir(os.path.join("nested", "test5"))
+
+        with open(
+            os.path.join(temp_dir, "nested", "test5", "__init__.py"),
+            "w",
+            encoding="utf-8",
+        ) as f5:
+            f5.write("thing5 = 'thing5'\n")
+
         multi_mpy = await compile_multi_file("test.py", abi)
         pos = 0
 
@@ -140,6 +160,12 @@ def unpack_mpy(data: bytes) -> tuple[bytes, bytes]:
         name5, mpy5 = unpack_mpy(multi_mpy)
         names.add(name5.decode())
 
+        name6, mpy6 = unpack_mpy(multi_mpy)
+        names.add(name6.decode())
+
+        name7, mpy7 = unpack_mpy(multi_mpy)
+        names.add(name7.decode())
+
         assert pos == len(multi_mpy)
 
         # It is important that the main module is first.
@@ -153,9 +179,9 @@ def unpack_mpy(data: bytes) -> tuple[bytes, bytes]:
         assert "nested.test3" in names
 
         if uses_module_finder:
-            assert len(names) == 4
+            assert len(names) == 6
         else:
-            assert len(names) == 3
+            assert len(names) == 5
 
         def check_mpy(mpy: bytes) -> None:
             magic, abi_ver, flags, int_bits = struct.unpack_from("<BBBB", mpy)
@@ -171,3 +197,5 @@ def check_mpy(mpy: bytes) -> None:
         if uses_module_finder:
             check_mpy(mpy4)  # pyright: ignore[reportPossiblyUnboundVariable]
         check_mpy(mpy5)
+        check_mpy(mpy6)
+        check_mpy(mpy7)