wip: full typing with mypy

Author: sigma67

cmake_file_api/kinds/cache/v2.py

@@ -75,15 +75,15 @@ def __init__(self, version: VersionMajorMinor, entries: List[CacheEntry]):
         self.entries = entries
 
     @classmethod
-    def from_dict(cls, dikt: Dict, reply_path) -> "CacheModelV2":
+    def from_dict(cls, dikt: Dict, reply_path) -> "CacheV2":
         if dikt["kind"] != cls.KIND.value:
             raise ValueError
         version = VersionMajorMinor.from_dict(dikt["version"])
         entries = list(CacheEntry.from_dict(ce) for ce in dikt["entries"])
         return cls(version, entries)
 
     @classmethod
-    def from_path(cls, path: Path, reply_path: Path) -> "CacheModelV2":
+    def from_path(cls, path: Path, reply_path: Path) -> "CacheV2":
         dikt = json.load(path.open())
         return cls.from_dict(dikt, reply_path)
 

cmake_file_api/kinds/cmakeFiles/v1.py

@@ -16,7 +16,7 @@ def __init__(self, path: Path, isGenerator: Optional[bool], isExternal: Optional
         self.isCMake = isCMake
 
     @classmethod
-    def from_dict(cls, dikt: Dict) -> "CMakeFileInput":
+    def from_dict(cls, dikt: Dict) -> "CMakeFilesInput":
         path = Path(dikt["path"])
         isGenerator = dikt.get("isGenerator")
         isExternal = dikt.get("isExternal")

cmake_file_api/kinds/codemodel/target/v2.py

@@ -206,7 +206,7 @@ def __init__(self, commandFragments: List[TargetArchiveFragment], lto: Optional[
     def from_dict(cls, dikt: Dict) -> "TargetArchive":
         commandFragments = []
         if "commandFragments" in dikt:
-            commandFragments = list(TargetLinkFragment.from_dict(tlf) for tlf in dikt["commandFragments"])
+            commandFragments = list(TargetArchiveFragment.from_dict(tlf) for tlf in dikt["commandFragments"])
         lto = dikt.get("lto")
         return cls(commandFragments, lto)
 

cmake_file_api/kinds/configureLog/target/v2.py

@@ -61,7 +61,7 @@ class BacktraceGraph(object):
     __slots__ = ("nodes", )
 
     def __init__(self, nodes: List[BacktraceNode]):
-        self.nodes = nodes
+        self.nodes: List[BacktraceNode] = nodes
 
     @classmethod
     def from_dict(cls, dikt: Dict) -> "BacktraceGraph":
@@ -205,7 +205,7 @@ def __init__(self, commandFragments: List[TargetArchiveFragment], lto: Optional[
     def from_dict(cls, dikt: Dict) -> "TargetArchive":
         commandFragments = []
         if "commandFragments" in dikt:
-            commandFragments = list(TargetLinkFragment.from_dict(tlf) for tlf in dikt["commandFragments"])
+            commandFragments = list(TargetArchiveFragment.from_dict(tlf) for tlf in dikt["commandFragments"])
         lto = dikt.get("lto")
         return cls(commandFragments, lto)
 
@@ -222,7 +222,7 @@ class TargetSourceGroup(object):
 
     def __init__(self, name: str, sources: List["TargetSource"]):
         self.name = name
-        self.sources = []
+        self.sources: list[TargetSource] = []
 
     @classmethod
     def from_dict(cls, dikt: Dict, target_sources: List["TargetSource"]) -> "TargetSourceGroup":
@@ -283,7 +283,7 @@ def __repr__(self) -> str:
 class TargetCompileGroupPCH(object):
     __slots__ = ("header", "backtrace")
 
-    def __init__(self, header: Path, backtrace: BacktraceNode):
+    def __init__(self, header: Path, backtrace: BacktraceNode | None):
         self.header = header
         self.backtrace = backtrace
 
@@ -306,7 +306,7 @@ def __repr__(self) -> str:
 class TargetCompileGroupDefine(object):
     __slots__ = ("define", "backtrace")
 
-    def __init__(self, define: str, backtrace: BacktraceNode):
+    def __init__(self, define: str, backtrace: BacktraceNode | None):
         self.define = define
         self.backtrace = backtrace
 
@@ -370,7 +370,7 @@ class TargetDependency(object):
 
     def __init__(self, id: str, backtrace: Optional[BacktraceNode]):
         self.id = id
-        self.target = None  # type: CodemodelTargetV2
+        self.target: CodemodelTargetV2 | None = None
         self.backtrace = backtrace
 
     def update_dependency(self, lut_id_target: Dict[str, "CodemodelTargetV2"]):
@@ -462,7 +462,7 @@ def update_dependencies(self, lut_id_target: Dict[str, "CodemodelTargetV2"]):
             dependency.update_dependency(lut_id_target)
 
     @classmethod
-    def from_dict(cls, dikt: Dict, reply_path: Path) -> "CodemodelTargetV2":
+    def from_dict(cls, dikt: Dict) -> "CodemodelTargetV2":
         name = dikt["name"]
         id = dikt["id"]
         type = TargetType(dikt["type"])

cmake_file_api/py.typed

@@ -1 +1,2 @@
 pytest
+mypy