Implmented LintedBuildSpec struct to properly evaluate error if any, in the visitor method instead of the from implementation.

Signed-off-by: Nichol Yip <[email protected]>

Author: Nichol Yip

crates/spk-schema/src/v0/spec.rs

@@ -847,14 +847,19 @@ where
     }
 }
 
+pub struct LintedBuildSpec {
+    build_spec: BuildSpec,
+    lints: Vec<Lint>,
+}
+
 #[derive(FieldNamesAsArray)]
 struct SpecVisitor<B, T> {
     pkg: Option<Ident<B, T>>,
     meta: Option<LintedItem<Meta>>,
     compat: Option<Compat>,
     deprecated: Option<bool>,
     sources: Option<Vec<LintedItem<SourceSpec>>>,
-    build: Option<LintedItem<UncheckedBuildSpec>>,
+    build: Option<LintedBuildSpec>,
     tests: Option<Vec<LintedItem<TestSpec>>>,
     install: Option<LintedItem<InstallSpec>>,
     #[field_names_as_array(skip)]
@@ -902,14 +907,7 @@ where
                     .collect_vec()
             },
             build: match value.build.take() {
-                Some(build_spec) if !value.check_build_spec => {
-                    // Safety: see the SpecVisitor::package constructor
-                    unsafe { build_spec.item.into_inner() }
-                }
-                Some(build_spec) => match build_spec.item.try_into() {
-                    Ok(b) => b,
-                    Err(_) => BuildSpec::default(),
-                },
+                Some(build) => build.build_spec,
                 None => Default::default(),
             },
             tests: value
@@ -995,7 +993,20 @@ where
                 "compat" => self.compat = Some(map.next_value::<Compat>()?),
                 "deprecated" => self.deprecated = Some(map.next_value::<bool>()?),
                 "sources" => self.sources = Some(map.next_value::<Vec<LintedItem<SourceSpec>>>()?),
-                "build" => self.build = Some(map.next_value::<LintedItem<UncheckedBuildSpec>>()?),
+                "build" => {
+                    self.build = {
+                        let build = map.next_value::<LintedItem<UncheckedBuildSpec>>()?;
+                        let lints = build.lints.clone();
+                        let build_spec = if !self.check_build_spec {
+                            // Safety: see the SpecVisitor::package constructor
+                            unsafe { build.item.into_inner() }
+                        } else {
+                            build.item.try_into().map_err(serde::de::Error::custom)?
+                        };
+
+                        Some(LintedBuildSpec { build_spec, lints })
+                    }
+                }
                 "tests" => self.tests = Some(map.next_value::<Vec<LintedItem<TestSpec>>>()?),
                 "install" => self.install = Some(map.next_value::<LintedItem<InstallSpec>>()?),
                 "api" => {
@@ -1015,12 +1026,6 @@ where
             .as_ref()
             .ok_or_else(|| serde::de::Error::missing_field("pkg"))?;
 
-        if self.check_build_spec {
-            if let Some(build_spec) = self.build.as_ref() {
-                TryInto::<BuildSpec>::try_into(build_spec.item).map_err(serde::de::Error::custom)?;
-            }
-        }
-
         Ok(self)
     }
 }