Resolve exported packages' imports

rflx/model/model.py

@@ -1,9 +1,8 @@
-from collections import defaultdict
 from pathlib import Path
-from typing import Dict, List, Sequence, Union
+from typing import Dict, Sequence
 
 from rflx import const
-from rflx.common import Base, indent, verbose_repr
+from rflx.common import Base, verbose_repr
 from rflx.error import RecordFluxError, Severity, Subsystem
 from rflx.identifier import ID
 from rflx.model.package import Package
@@ -46,11 +45,15 @@ def create_specifications(self) -> Dict[ID, str]:
         pkgs: Dict[ID, Package] = {}
         for ty in self.__types:
             if not type_.is_builtin_type(ty.name) and not type_.is_internal_type(ty.name):
-                pkg = ty.package
-                pkgs.setdefault(pkg, Package(pkg)).types.append(ty)
+                pkg_name: ID = ty.package
+                pkg: Package = pkgs.setdefault(pkg_name, Package(pkg_name))
+                for dep in ty.dependencies:
+                    if dep.package != pkg_name:
+                        pkg.imports.append(dep.package)
+                pkg.types.append(ty)
         for sess in self.__sessions:
-            pkg = sess.package
-            pkgs.setdefault(pkg, Package(pkg)).sessions.append(sess)
+            pkg_name = sess.package
+            pkgs.setdefault(pkg_name, Package(pkg_name)).sessions.append(sess)
         return {id: str(pkg) for id, pkg in pkgs.items()}
 
     def write_specification_files(self, output_dir: Path) -> None:

rflx/model/package.py

@@ -37,9 +37,5 @@ def sessions_str(self) -> str:
         return textwrap.indent(raw, " " * 3)
 
     def __str__(self) -> str:
-        return "\n\n".join(
-            filter(
-                None,
-                [self.imports_str, self.begin_str, self.types_str, self.sessions_str, self.end_str],
-            )
-        )
+        pieces = [self.imports_str, self.begin_str, self.types_str, self.sessions_str, self.end_str]
+        return "\n\n".join(filter(None, pieces))

tests/unit/model/model_test.py

@@ -210,5 +210,5 @@ def test_write_specification_file_multiple_packages(tmp_path: Path) -> None:
 
            type U is mod 65536;
 
-        end P;"""
+        end Q;"""
     )