Vcpkg Dependency Resolution

Author: Behemyth

cppython/plugins/vcpkg/resolution.py

@@ -2,6 +2,9 @@
 
 from typing import Any
 
+from packaging.requirements import Requirement
+
+from cppython.core.exception import ConfigException
 from cppython.core.schema import CorePluginData
 from cppython.plugins.vcpkg.schema import (
     Manifest,
@@ -54,11 +57,44 @@ def resolve_vcpkg_data(data: dict[str, Any], core_data: CorePluginData) -> Vcpkg
     modified_install_directory.mkdir(parents=True, exist_ok=True)
 
     vcpkg_dependencies: list[VcpkgDependency] = []
-    for dependency in parsed_data.dependencies:
-        vcpkg_dependency = VcpkgDependency(name=dependency.name)
-        vcpkg_dependencies.append(vcpkg_dependency)
+    for requirement in core_data.cppython_data.dependencies:
+        resolved_dependency = resolve_vcpkg_dependency(requirement)
+        vcpkg_dependencies.append(resolved_dependency)
 
     return VcpkgData(
         install_directory=modified_install_directory,
         dependencies=vcpkg_dependencies,
     )
+
+
+def resolve_vcpkg_dependency(requirement: Requirement) -> VcpkgDependency:
+    """Resolve a VcpkgDependency from a packaging requirement.
+
+    Args:
+        requirement: A packaging requirement object.
+
+    Returns:
+        A resolved VcpkgDependency object.
+    """
+    specifiers = requirement.specifier
+
+    # If the length of specifiers is greater than one, raise a configuration error
+    if len(specifiers) > 1:
+        raise ConfigException('Multiple specifiers are not supported. Please provide a single specifier.', [])
+
+    # Extract the version from the single specifier
+    version = None
+    if len(specifiers) == 1:
+        specifier = next(iter(specifiers))
+        if specifier.operator != '>=':
+            raise ConfigException(f"Unsupported specifier '{specifier.operator}'. Only '>=' is supported.", [])
+        version = specifier.version
+
+    return VcpkgDependency(
+        name=requirement.name,
+        default_features=True,
+        features=[],
+        version=version,
+        platform=None,
+        host=False,
+    )

cppython/plugins/vcpkg/schema.py

@@ -11,7 +11,32 @@
 class VcpkgDependency(CPPythonModel):
     """Vcpkg dependency type"""
 
-    name: str
+    name: Annotated[str, Field(description='The name of the dependency.')]
+    default_features: Annotated[
+        bool,
+        Field(
+            alias='default-features',
+            description='Whether to use the default features of the dependency. Defaults to true.',
+        ),
+    ] = True
+    features: Annotated[
+        list[str],
+        Field(description='A list of additional features to require for the dependency.'),
+    ] = []
+    version: Annotated[
+        str | None,
+        Field(
+            description='The minimum required version of the dependency, optionally with a port-version suffix.',
+        ),
+    ] = None
+    platform: Annotated[
+        str | None,
+        Field(description='A platform expression specifying the platforms where the dependency applies.'),
+    ] = None
+    host: Annotated[
+        bool,
+        Field(description='Whether the dependency is required for the host machine instead of the target.'),
+    ] = False
 
 
 class VcpkgData(CPPythonModel):
@@ -32,10 +57,6 @@ class VcpkgConfiguration(CPPythonModel):
         ),
     ] = Path('build')
 
-    dependencies: Annotated[
-        list[VcpkgDependency], Field(description='The directory to store the manifest file, vcpkg.json')
-    ] = []
-
 
 class Manifest(CPPythonModel):
     """The manifest schema"""

tests/unit/plugins/vcpkg/test_resolution.py

@@ -0,0 +1,23 @@
+"""Unit tests for the Vcpkg resolution plugin."""
+
+from packaging.requirements import Requirement
+
+from cppython.plugins.vcpkg.resolution import resolve_vcpkg_dependency
+
+
+class TestVcpkgResolution:
+    """Test the resolution of Vcpkg dependencies"""
+
+    @staticmethod
+    def test_resolve_vcpkg_dependency() -> None:
+        """Test resolving a VcpkgDependency from a packaging requirement."""
+        requirement = Requirement('example-package>=1.2.3')
+
+        dependency = resolve_vcpkg_dependency(requirement)
+
+        assert dependency.name == 'example-package'
+        assert dependency.version == '1.2.3'
+        assert dependency.default_features is True
+        assert dependency.features == []
+        assert dependency.platform is None
+        assert dependency.host is False