Merge pull request #1296 from spkenv/pkg-request-with-options

Create a package request with options concept

Author: jrray

crates/spk-build/src/build/binary.rs

@@ -28,13 +28,15 @@ use spk_schema::ident::{
     PkgRequest,
     PreReleasePolicy,
     RangeIdent,
+    RequestWithOptions,
     RequestedBy,
     VersionIdent,
 };
+use spk_schema::spec_ops::ComponentFileMatchMode;
 use spk_schema::variant::Override;
 use spk_schema::{
     BuildIdent,
-    ComponentFileMatchMode,
+    ComponentSpec,
     ComponentSpecList,
     Components,
     InputVariant,
@@ -108,6 +110,13 @@ where
     ) -> std::borrow::Cow<'_, spk_schema::RequirementsList<PinnedRequest>> {
         self.resolved_variant.additional_requirements()
     }
+
+    #[inline]
+    fn additional_requirements_with_options(
+        &self,
+    ) -> std::borrow::Cow<'_, spk_schema::RequirementsList<RequestWithOptions>> {
+        self.resolved_variant.additional_requirements_with_options()
+    }
 }
 
 impl<V1, V2> InputVariant for VariantPair<V1, V2>
@@ -479,7 +488,10 @@ where
             self.solver.add_repository(repo);
         }
 
-        let build_requirements = self.recipe.get_build_requirements(variant)?.into_owned();
+        let build_requirements = self
+            .recipe
+            .get_build_requirements_with_options(variant)?
+            .into_owned();
         for request in build_requirements.iter().cloned() {
             self.solver.add_request(request);
         }
@@ -805,7 +817,7 @@ where
 fn split_manifest_by_component(
     pkg: &BuildIdent,
     manifest: &spfs::tracking::Manifest,
-    components: &ComponentSpecList<PinnedRequest>,
+    components: &ComponentSpecList<ComponentSpec>,
 ) -> Result<HashMap<Component, spfs::tracking::Manifest>> {
     let mut seen = HashSet::new();
     let mut manifests = HashMap::with_capacity(components.len());

crates/spk-build/src/build/binary_test.rs

@@ -17,6 +17,7 @@ use spk_schema::{
     Components,
     FromYaml,
     OptionMap,
+    OptionValues,
     Package,
     Recipe,
     SpecRecipe,

crates/spk-build/src/validation/alter_existing_files_test.rs

@@ -30,7 +30,12 @@ async fn test_validate_build_changeset_modified() {
         },
         setup: BuildSetupReport {
             environment: Solution::default(),
-            variant: package.build.variants.first().cloned().unwrap_or_default(),
+            variant: package
+                .build()
+                .variants
+                .first()
+                .cloned()
+                .unwrap_or_default(),
             environment_filesystem: Manifest::new(
                 spfs::tracking::Entry::empty_dir_with_open_perms_with_data(package.ident().clone()),
             ),

crates/spk-build/src/validation/collect_all_files_test.rs

@@ -15,7 +15,9 @@ async fn test_validate_build_changeset_collected() {
     let mut package = v0::PackageSpec::new("test-pkg/1.0.0/3I42H3S6".parse().unwrap());
     // the default components are added and collect all files,
     // so we remove them to ensure nothing is collected
-    let _ = package.install.components.drain(..);
+    package.install_mut(|install| {
+        install.components.drain(..);
+    });
     let report = BuildReport {
         output: BuildOutputReport {
             collected_changes: vec![spfs::tracking::Diff {
@@ -27,7 +29,7 @@ async fn test_validate_build_changeset_collected() {
                 ),
             }],
             components: package
-                .install
+                .install()
                 .components
                 .iter()
                 .map(|c| {
@@ -46,7 +48,12 @@ async fn test_validate_build_changeset_collected() {
         },
         setup: BuildSetupReport {
             environment: Solution::default(),
-            variant: package.build.variants.first().cloned().unwrap_or_default(),
+            variant: package
+                .build()
+                .variants
+                .first()
+                .cloned()
+                .unwrap_or_default(),
             environment_filesystem: Manifest::new(
                 spfs::tracking::Entry::empty_dir_with_open_perms_with_data(package.ident().clone()),
             ),

crates/spk-build/src/validation/collect_existing_files_test.rs

@@ -41,7 +41,12 @@ async fn test_validate_build_changeset_collect_existing() {
         },
         setup: BuildSetupReport {
             environment: Solution::default(),
-            variant: package.build.variants.first().cloned().unwrap_or_default(),
+            variant: package
+                .build()
+                .variants
+                .first()
+                .cloned()
+                .unwrap_or_default(),
             environment_filesystem,
             package,
         },

crates/spk-build/src/validation/empty_package_test.rs

@@ -16,7 +16,12 @@ async fn test_validate_build_changeset_nothing() {
     let report = BuildReport {
         setup: BuildSetupReport {
             environment: Solution::default(),
-            variant: package.build.variants.first().cloned().unwrap_or_default(),
+            variant: package
+                .build()
+                .variants
+                .first()
+                .cloned()
+                .unwrap_or_default(),
             environment_filesystem: Manifest::new(
                 spfs::tracking::Entry::empty_dir_with_open_perms_with_data(package.ident().clone()),
             ),

crates/spk-build/src/validation/inherit_requirements_test.rs

@@ -7,7 +7,7 @@ use std::sync::Arc;
 use spfs::tracking::Manifest;
 use spk_schema::foundation::fixtures::*;
 use spk_schema::foundation::option_map;
-use spk_schema::ident::PkgRequest;
+use spk_schema::ident::PkgRequestWithOptions;
 use spk_schema::validation::ValidationMatcher;
 use spk_schema::{Package, PinnableRequest, ValidationRule, spec};
 use spk_solve::{RequestedBy, Solution};
@@ -39,7 +39,10 @@ async fn test_build_package_downstream_build_requests() {
 
     let mut environment = Solution::default();
     environment.add(
-        PkgRequest::from_ident(base_spec.ident().to_any_ident(), RequestedBy::DoesNotMatter),
+        PkgRequestWithOptions::from_ident(
+            base_spec.ident().to_any_ident(),
+            RequestedBy::DoesNotMatter,
+        ),
         base_spec.clone(),
         spk_solve::PackageSource::SpkInternalTest,
     );
@@ -107,7 +110,10 @@ async fn test_build_package_downstream_runtime_request() {
 
     let mut environment = Solution::default();
     environment.add(
-        PkgRequest::from_ident(base_spec.ident().to_any_ident(), RequestedBy::DoesNotMatter),
+        PkgRequestWithOptions::from_ident(
+            base_spec.ident().to_any_ident(),
+            RequestedBy::DoesNotMatter,
+        ),
         base_spec.clone(),
         spk_solve::PackageSource::SpkInternalTest,
     );

crates/spk-build/src/validation/long_var_description_test.rs

@@ -6,7 +6,7 @@ use std::sync::Arc;
 
 use spfs::tracking::Manifest;
 use spk_schema::foundation::option_map;
-use spk_schema::ident::PkgRequest;
+use spk_schema::ident::PkgRequestWithOptions;
 use spk_schema::validation::ValidationMatcher;
 use spk_schema::{Package, ValidationRule, spec};
 use spk_solve::{RequestedBy, Solution};
@@ -30,7 +30,10 @@ async fn test_for_description_over_limit() {
 
     let mut environment = Solution::default();
     environment.add(
-        PkgRequest::from_ident(package.ident().to_any_ident(), RequestedBy::DoesNotMatter),
+        PkgRequestWithOptions::from_ident(
+            package.ident().to_any_ident(),
+            RequestedBy::DoesNotMatter,
+        ),
         package.clone(),
         spk_solve::PackageSource::SpkInternalTest,
     );

crates/spk-build/src/validation/recursive_build_test.rs

@@ -8,7 +8,7 @@ use rstest::rstest;
 use spfs::tracking::Manifest;
 use spk_schema::foundation::fixtures::*;
 use spk_schema::foundation::option_map;
-use spk_schema::ident::PkgRequest;
+use spk_schema::ident::PkgRequestWithOptions;
 use spk_schema::validation::ValidationMatcher;
 use spk_schema::{Package, ValidationRule, spec};
 use spk_solve::{RequestedBy, Solution};
@@ -36,7 +36,10 @@ async fn test_build_with_circular_dependency() {
 
     let mut environment = Solution::default();
     environment.add(
-        PkgRequest::from_ident(old_build.ident().to_any_ident(), RequestedBy::DoesNotMatter),
+        PkgRequestWithOptions::from_ident(
+            old_build.ident().to_any_ident(),
+            RequestedBy::DoesNotMatter,
+        ),
         old_build.clone(),
         spk_solve::PackageSource::SpkInternalTest,
     );

crates/spk-build/src/validation/strong_inheritance_var_desc.rs

@@ -32,7 +32,7 @@ impl super::Validator for StrongInheritanceVarDescriptionValidator {
         for opt in setup.package.get_build_options().iter() {
             match opt {
                 Opt::Pkg(_) => continue,
-                Opt::Var(v) => match v.inheritance {
+                Opt::Var(v) => match v.inheritance() {
                     Inheritance::Weak => continue,
                     _ => {
                         let mut outcome = Outcome {