PluginBuildData (#104)

Author: Behemyth

cppython/builder.py

@@ -12,6 +12,7 @@
 from cppython_core.plugin_schema.provider import Provider
 from cppython_core.plugin_schema.scm import SCM
 from cppython_core.resolution import (
+    PluginBuildData,
     resolve_cppython,
     resolve_cppython_plugin,
     resolve_generator,
@@ -42,13 +43,15 @@ def generate_core_data(
         configuration: ProjectConfiguration,
         pep621_configuration: PEP621Configuration,
         cppython_configuration: CPPythonLocalConfiguration,
+        plugin_build_date: PluginBuildData,
     ) -> CoreData:
         """Parses and returns resolved data from all configuration sources
 
         Args:
             configuration: Input configuration
             pep621_configuration: Project table configuration
             cppython_configuration: Tool configuration
+            plugin_build_date: Build data
 
         Raises:
             ConfigError: Raised if data cannot be parsed
@@ -68,7 +71,7 @@ def generate_core_data(
             configuration.version = self.extract_scm_version(configuration.pyproject_file.parent)
             pep621_data = resolve_pep621(pep621_configuration, configuration)
 
-        cppython_data = resolve_cppython(cppython_configuration, global_configuration, project_data)
+        cppython_data = resolve_cppython(cppython_configuration, global_configuration, project_data, plugin_build_date)
 
         return CoreData(project_data=project_data, pep621_data=pep621_data, cppython_data=cppython_data)
 

cppython/project.py

@@ -6,7 +6,7 @@
 from typing import Any
 
 from cppython_core.exceptions import ConfigError, PluginError
-from cppython_core.resolution import resolve_name
+from cppython_core.resolution import PluginBuildData, resolve_name
 from cppython_core.schema import CoreData, Interface, ProjectConfiguration, PyProject
 from pydantic import ValidationError
 
@@ -34,14 +34,7 @@ def __init__(
         self.logger.info("Initializing project")
 
         try:
-            if (pyproject := PyProject(**pyproject_data)) is None:
-                raise ConfigError("Table [project] is not defined")
-
-            if pyproject.tool is None:
-                raise ConfigError("Table [tool] is not defined")
-
-            if pyproject.tool.cppython is None:
-                raise ConfigError("Table [tool.cppython] is not defined")
+            pyproject = PyProject(**pyproject_data)
 
             builder = Builder(self.logger)
 
@@ -64,8 +57,12 @@ def __init__(
             # Solve the messy interactions between plugins
             generator_type, provider_type = builder.solve(generator_plugins, provider_plugins)
 
+            pyproject_build_data = PluginBuildData(generator_type=generator_type, provider_type=provider_type)
+
             # Once the plugins are resolved, the core data is complete and can be generated
-            self._core_data = builder.generate_core_data(configuration, pyproject.project, pyproject.tool.cppython)
+            self._core_data = builder.generate_core_data(
+                configuration, pyproject.project, pyproject.tool.cppython, pyproject_build_data
+            )
 
             # Create the chosen plugins
             self._generator = builder.create_generator(