new intermediate version

Author: amhellmund

src/cpp_dev/dependency/conan/command_wrapper.py

@@ -75,7 +75,7 @@ def conan_list(remote: str, name: str) -> Mapping[ConanPackageReferenceWithSeman
 ### Conan Graph Build-Order ###
 ###############################
 class ConanPackageInfo(BaseModel):
-    settings: Mapping[str, str] | None = None
+    settings: ConanSettings | None = None
 
 class ConanPackageAttributes(BaseModel):
     info: ConanPackageInfo

src/cpp_dev/dependency/conan/provider.py

@@ -45,7 +45,7 @@ def collect_dependency_hull(self, deps: list[DependencySpecifier]) -> list[Depen
                 conanfile_path = create_conanfile(tmp_dir, deps)
                 conan_settings = self._settings if self._settings else {}
                 build_order = conan_graph_buildorder(conanfile_path, self._profile, conan_settings)
-
+                _construct_depenencies(build_order.order)
                 print(build_order)
 
 
@@ -65,3 +65,6 @@ def _retrieve_conan_package_references(repository: str, name: str) -> list[Conan
         if ref.user == repository
     ]
     return package_references
+
+def _construct_depenencies(build_order: list[list[ConanRecipeAttributes]]) -> list[Dependency]:
+    ...

src/cpp_dev/dependency/conan/types.py

@@ -28,6 +28,12 @@ class ConanPackageReferenceWithSemanticVersion(RootModel):
 
     root: str
 
+    @staticmethod
+    def from_raw_string_with_revision(raw_string: str) -> ConanPackageReferenceWithSemanticVersion:
+        REVISION_MARKER = "#"
+        raw_string, revision = raw_string.rsplit(REVISION_MARKER, 1)
+        return ConanPackageReferenceWithSemanticVersion(raw_string)
+
     @model_validator(mode="after")
     def validate_reference(self) -> ConanPackageReferenceWithSemanticVersion:
         CONAN_REFERENCE_PATTERN = r"(?P<name>[a-zA-Z0-9_]+)/(?P<version>\d+\.\d+\.\d+)@(?P<user>[a-zA-Z0-9_]+)/(?P<channel>[a-zA-Z0-9_]+)"

src/tests/cpp_dev/dependency/conan/test_provider.py

@@ -26,10 +26,17 @@
 def conan_test_environment(tmp_path: Path, unused_http_port: int) -> Generator[ConanTestEnv]:
     TEST_PACKAGES = [
         ConanTestPackage(
-            ref=ConanPackageReferenceWithSemanticVersion("dep/1.0.0@official/cppdev"),
+            ref=ConanPackageReferenceWithSemanticVersion("subdep/1.0.0@official/cppdev"),
             dependencies=[],
             cpp_standard="c++20",
         ),
+        ConanTestPackage(
+            ref=ConanPackageReferenceWithSemanticVersion("dep/1.0.0@official/cppdev"),
+            dependencies=[
+                ConanPackageReferenceWithSemanticVersion("subdep/1.0.0@official/cppdev")
+            ],
+            cpp_standard="c++20",
+        ),
         ConanTestPackage(
             ref=ConanPackageReferenceWithSemanticVersion("cpd/1.0.0@official/cppdev"),
             dependencies=[],

src/tests/cpp_dev/dependency/conan/test_types.py

@@ -21,3 +21,12 @@ def test_conan_package_reference_valid() -> None:
     assert package_ref.version == SemanticVersion("1.2.3")
     assert package_ref.user == "user"
     assert package_ref.channel == "channel"
+
+
+def test_conan_package_reference_from_raw_string_with_revision() -> None:
+    package_ref = ConanPackageReferenceWithSemanticVersion.from_raw_string_with_revision("name/1.2.3@user/channel#revision")
+    
+    assert package_ref.name == "name"
+    assert package_ref.version == SemanticVersion("1.2.3")
+    assert package_ref.user == "user"
+    assert package_ref.channel == "channel"