Add Services::drop_and_validate

hannobraun · Jun 26, 2023 · 7f39c59 · 7f39c59
1 parent 1ce1670
commit 7f39c59
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/crates/fj-core/src/services/mod.rs b/crates/fj-core/src/services/mod.rs
@@ -6,7 +6,10 @@ mod objects;
 mod service;
 mod validation;
 
-use crate::objects::{Object, ObjectSet, Objects, WithHandle};
+use crate::{
+    objects::{Object, ObjectSet, Objects, WithHandle},
+    validate::ValidationErrors,
+};
 
 pub use self::{
     objects::{InsertObject, Operation},
@@ -61,6 +64,19 @@ impl Services {
         self.validation
             .execute(ValidationCommand::OnlyValidate { objects }, &mut events);
     }
+
+    /// Drop `Services`; return any unhandled validation error
+    pub fn drop_and_validate(self) -> Result<(), ValidationErrors> {
+        let errors = ValidationErrors(
+            self.validation.errors.values().cloned().collect(),
+        );
+
+        if errors.0.is_empty() {
+            Ok(())
+        } else {
+            Err(errors)
+        }
+    }
 }
 
 impl Default for Services {