fix remaining issues

Author: sigma67

cmake_file_api/kinds/api.py

@@ -1,3 +1,7 @@
+from pathlib import Path
+from typing import Protocol
+from typing_extensions import Self
+
 from .kind import ObjectKind
 from .cache.api import CACHE_API
 from .cmakeFiles.api import CMAKEFILES_API
@@ -6,7 +10,14 @@
 from .toolchains.api import TOOLCHAINS_API
 
 
-OBJECT_KINDS_API = {
+class CMakeApiType(Protocol):
+    KIND: ObjectKind
+
+    @classmethod
+    def from_path(cls, path: Path, reply_path: Path) -> Self:
+        ...
+
+OBJECT_KINDS_API: dict[ObjectKind, dict[int, CMakeApiType]] = {
     ObjectKind.CACHE: CACHE_API,
     ObjectKind.CMAKEFILES: CMAKEFILES_API,
     ObjectKind.CONFIGURELOG: CONFIGURELOG_API,

cmake_file_api/kinds/cache/api.py

@@ -1,6 +1,6 @@
 from .v2 import CacheV2
+from ..api import CMakeApiType
 
-
-CACHE_API = {
+CACHE_API: dict[int, CMakeApiType] = {
     2: CacheV2,
 }

cmake_file_api/kinds/cmakeFiles/api.py

@@ -1,6 +1,6 @@
 from .v1 import CMakeFilesV1
+from ..api import CMakeApiType
 
-
-CMAKEFILES_API = {
+CMAKEFILES_API: dict[int, CMakeApiType]  = {
     1: CMakeFilesV1,
 }

cmake_file_api/kinds/codemodel/api.py

@@ -1,6 +1,6 @@
 from .v2 import CodemodelV2
+from ..api import CMakeApiType
 
-
-CODEMODEL_API = {
+CODEMODEL_API: dict[int, CMakeApiType]  = {
     2: CodemodelV2,
 }

cmake_file_api/kinds/codemodel/target/v2.py

@@ -284,7 +284,7 @@ def __repr__(self) -> str:
 class TargetCompileGroupPCH:
     __slots__ = ("header", "backtrace")
 
-    def __init__(self, header: Path, backtrace: BacktraceNode):
+    def __init__(self, header: Path, backtrace: Optional[BacktraceNode]):
         self.header = header
         self.backtrace = backtrace
 
@@ -307,7 +307,7 @@ def __repr__(self) -> str:
 class TargetCompileGroupDefine:
     __slots__ = ("define", "backtrace")
 
-    def __init__(self, define: str, backtrace: BacktraceNode):
+    def __init__(self, define: str, backtrace: Optional[BacktraceNode]):
         self.define = define
         self.backtrace = backtrace
 

cmake_file_api/kinds/configureLog/api.py

@@ -1,6 +1,6 @@
 from .v1 import ConfigureLogV1
+from ..api import CMakeApiType
 
-
-CONFIGURELOG_API = {
+CONFIGURELOG_API: dict[int, CMakeApiType]  = {
     1: ConfigureLogV1,
 }

cmake_file_api/kinds/toolchains/api.py

@@ -1,6 +1,6 @@
 from .v1 import ToolchainsV1
+from ..api import CMakeApiType
 
-
-TOOLCHAINS_API = {
+TOOLCHAINS_API: dict[int, CMakeApiType]  = {
     1: ToolchainsV1,
 }

cmake_file_api/reply/v1/api.py

@@ -1,8 +1,8 @@
 from pathlib import Path
-from typing import Optional
+from typing import Any, Optional
 
 from cmake_file_api.errors import CMakeException
-from cmake_file_api.kinds.api import OBJECT_KINDS_API
+from cmake_file_api.kinds.api import CMakeApiType, OBJECT_KINDS_API
 from cmake_file_api.kinds.cmakeFiles.v1 import CMakeFilesV1
 from cmake_file_api.reply.index.api import INDEX_API
 from cmake_file_api.kinds.kind import ObjectKind
@@ -68,14 +68,14 @@ def index(self) -> CMakeReplyFileV1:
         reply_path = self._create_reply_path()
         return self._index(reply_path)
 
-    def inspect(self, kind: ObjectKind, kind_version: int) -> Optional[CMakeFilesV1]:
+    def inspect(self, kind: ObjectKind, kind_version: int) -> Optional[CMakeApiType]:
         reply_path = self._create_reply_path()
         index = self._index(reply_path)
 
         data_path = index.reply.stateless.get((kind, kind_version), None)
         if data_path is None:
             return None
-        api = OBJECT_KINDS_API.get(kind, {}).get(kind_version, None)
+        api: Optional[CMakeApiType] = OBJECT_KINDS_API.get(kind, {}).get(kind_version, None)
         if api is None:
             return None
         return api.from_path(reply_path / str(data_path.jsonFile), reply_path)
@@ -84,7 +84,7 @@ def inspect_all(self) -> dict[ObjectKind, dict[int, object]]:
         reply_path = self._create_reply_path()
         index = self._index(reply_path)
 
-        result = {}
+        result: dict[ObjectKind, dict[int, Any]] = {}
         for (kind, kind_version), reply_file_ref in index.reply.stateless.items():
             api = OBJECT_KINDS_API.get(kind, {}).get(kind_version, None)
             if api is None: