yerba 0.4.2 → 0.5.0

data/rust/src/yerbafile.rs

@@ -9,6 +9,8 @@ use crate::{Document, QuoteStyle, YerbaError};
 pub struct Yerbafile {
   #[serde(default)]
   pub rules: Vec<Rule>,
+  #[serde(skip)]
+  pub directory: Option<PathBuf>,
 }
 
 #[derive(Debug, Clone, Deserialize)]
@@ -31,6 +33,8 @@ pub enum PipelineStep {
   BlankLines(BlankLinesConfig),
   Sort(SortConfig),
   Directives(DirectivesConfig),
+  Unique(UniqueConfig),
+  Schema(SchemaConfig),
 }
 
 #[derive(Debug, Clone, Deserialize)]
@@ -58,6 +62,31 @@ pub struct DirectivesConfig {
   pub remove: bool,
 }
 
+#[derive(Debug, Clone, Deserialize)]
+pub struct UniqueConfig {
+  #[serde(default)]
+  pub path: Option<String>,
+  #[serde(default = "default_dot")]
+  pub by: String,
+  #[serde(default)]
+  pub remove: bool,
+  #[serde(default)]
+  pub allow_blank_duplicates: bool,
+}
+
+fn default_dot() -> String {
+  ".".to_string()
+}
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct SchemaConfig {
+  pub file: String,
+  #[serde(default)]
+  pub path: Option<String>,
+  #[serde(default)]
+  pub items: bool,
+}
+
 #[derive(Debug, Clone, Deserialize)]
 pub struct RenameConfig {
   pub from: String,
@@ -131,8 +160,18 @@ impl<'de> Deserialize<'de> for PipelineStep {
       return Ok(PipelineStep::Sort(config));
     }
 
+    if let Some(value) = mapping.get(serde_yaml::Value::String("unique".to_string())) {
+      let config: UniqueConfig = serde_yaml::from_value(value.clone()).map_err(serde::de::Error::custom)?;
+      return Ok(PipelineStep::Unique(config));
+    }
+
+    if let Some(value) = mapping.get(serde_yaml::Value::String("schema".to_string())) {
+      let config: SchemaConfig = serde_yaml::from_value(value.clone()).map_err(serde::de::Error::custom)?;
+      return Ok(PipelineStep::Schema(config));
+    }
+
     Err(serde::de::Error::custom(
-      "unknown pipeline step: expected sort_keys, quote_style, set, insert, delete, rename, remove, blank_lines, sort, or directives",
+      "unknown pipeline step: expected sort_keys, quote_style, set, insert, delete, rename, remove, blank_lines, sort, directives, unique, or schema",
     ))
   }
 }
@@ -184,16 +223,24 @@ fn default_key_style() -> String {
 pub struct RuleResult {
   pub file: String,
   pub changed: bool,
-  pub error: Option<String>,
+  pub error: Option<YerbaError>,
 }
 
 impl Yerbafile {
   pub fn load(path: impl AsRef<Path>) -> Result<Self, YerbaError> {
     let content = fs::read_to_string(path.as_ref())?;
-    let yerbafile: Yerbafile = serde_yaml::from_str(&content).map_err(|error| YerbaError::ParseError(format!("{}", error)))?;
+    let mut yerbafile: Yerbafile = serde_yaml::from_str(&content).map_err(|error| YerbaError::ParseError(format!("{}", error)))?;
+    yerbafile.directory = path.as_ref().parent().map(|p| p.to_path_buf());
     Ok(yerbafile)
   }
 
+  pub fn resolve_path(&self, relative: &str) -> PathBuf {
+    match &self.directory {
+      Some(directory) => directory.join(relative),
+      None => PathBuf::from(relative),
+    }
+  }
+
   pub fn find() -> Option<PathBuf> {
     Self::find_from(std::env::current_dir().ok()?)
   }
@@ -255,7 +302,7 @@ impl Yerbafile {
           results.push(RuleResult {
             file: rule.files.clone(),
             changed: false,
-            error: Some(format!("invalid glob: {}", error)),
+            error: Some(YerbaError::ParseError(format!("invalid glob: {}", error))),
           });
 
           continue;
@@ -280,7 +327,7 @@ impl Yerbafile {
                   return Some(RuleResult {
                     file: file.clone(),
                     changed: false,
-                    error: Some(format!("{}", error)),
+                    error: Some(error),
                   });
                 }
               };
@@ -289,7 +336,7 @@ impl Yerbafile {
                 Some(RuleResult {
                   file: file.clone(),
                   changed: false,
-                  error: Some(format!("{}", error)),
+                  error: Some(error),
                 })
               } else {
                 None
@@ -323,7 +370,7 @@ impl Yerbafile {
         return RuleResult {
           file: file.to_string(),
           changed: false,
-          error: Some(format!("{}", error)),
+          error: Some(error),
         }
       }
     };
@@ -332,11 +379,11 @@ impl Yerbafile {
     let base_path = rule.path.as_deref();
 
     for step in &rule.pipeline {
-      if let Err(error) = execute_step(&mut document, step, base_path) {
+      if let Err(error) = execute_step(&mut document, step, base_path, file, self) {
         return RuleResult {
           file: file.to_string(),
           changed: false,
-          error: Some(format!("{}", error)),
+          error: Some(error),
         };
       }
     }
@@ -349,7 +396,7 @@ impl Yerbafile {
         return RuleResult {
           file: file.to_string(),
           changed,
-          error: Some(format!("{}", error)),
+          error: Some(YerbaError::IoError(error)),
         };
       }
     }
@@ -396,7 +443,7 @@ impl Yerbafile {
       let base_path = rule.path.as_deref();
 
       for step in &rule.pipeline {
-        execute_step(document, step, base_path)?;
+        execute_step(document, step, base_path, file_path, self)?;
       }
     }
 
@@ -404,7 +451,7 @@ impl Yerbafile {
   }
 }
 
-fn execute_step(document: &mut Document, step: &PipelineStep, base_path: Option<&str>) -> Result<(), YerbaError> {
+fn execute_step(document: &mut Document, step: &PipelineStep, base_path: Option<&str>, _file: &str, yerbafile: &Yerbafile) -> Result<(), YerbaError> {
   match step {
     PipelineStep::QuoteStyle(config) => {
       let dot_path = config.path.as_deref();
@@ -461,15 +508,33 @@ fn execute_step(document: &mut Document, step: &PipelineStep, base_path: Option<
     PipelineStep::Delete(config) => {
       let full_path = resolve_step_path(base_path, Some(&config.path));
 
-      if let Some(condition) = &config.condition {
-        let parent_path = full_path.rsplit_once('.').map(|(parent, _)| parent).unwrap_or("");
+      if full_path.contains("[]") {
+        let concrete_selectors = document.resolve_selectors(&full_path);
 
-        if !document.evaluate_condition(parent_path, condition) {
-          return Ok(());
+        for selector in concrete_selectors.into_iter().rev() {
+          if let Some(condition) = &config.condition {
+            let parent_path = selector.rsplit_once('.').map(|(parent, _)| parent).unwrap_or("");
+
+            if !document.evaluate_condition(parent_path, condition) {
+              continue;
+            }
+          }
+
+          document.delete(&selector)?;
         }
-      }
 
-      document.delete(&full_path)
+        Ok(())
+      } else {
+        if let Some(condition) = &config.condition {
+          let parent_path = full_path.rsplit_once('.').map(|(parent, _)| parent).unwrap_or("");
+
+          if !document.evaluate_condition(parent_path, condition) {
+            return Ok(());
+          }
+        }
+
+        document.delete(&full_path)
+      }
     }
 
     PipelineStep::Rename(config) => {
@@ -526,6 +591,30 @@ fn execute_step(document: &mut Document, step: &PipelineStep, base_path: Option<
         Ok(())
       }
     }
+
+    PipelineStep::Schema(config) => {
+      let schema_path = yerbafile.resolve_path(&config.file);
+      let schema = crate::schema::load_schema(&schema_path)?;
+      let selector = resolve_step_path(base_path, config.path.as_deref());
+      let errors = document.validate_schema(&schema, config.items, if selector.is_empty() { None } else { Some(&selector) });
+
+      if errors.is_empty() {
+        Ok(())
+      } else {
+        Err(YerbaError::SchemaValidation(errors))
+      }
+    }
+
+    PipelineStep::Unique(config) => {
+      let full_path = resolve_step_path(base_path, config.path.as_deref());
+      let duplicates = document.unique_with_options(&full_path, &config.by, config.remove, config.allow_blank_duplicates)?;
+
+      if !duplicates.is_empty() && !config.remove {
+        return Err(YerbaError::DuplicateValues(duplicates));
+      }
+
+      Ok(())
+    }
   }
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yerba
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Marco Roth
@@ -31,6 +31,7 @@ files:
 - lib/yerba/formatting.rb
 - lib/yerba/location.rb
 - lib/yerba/map.rb
+- lib/yerba/node.rb
 - lib/yerba/query_result.rb
 - lib/yerba/scalar.rb
 - lib/yerba/sequence.rb
@@ -49,6 +50,7 @@ files:
 - rust/src/commands/get.rs
 - rust/src/commands/init.rs
 - rust/src/commands/insert.rs
+- rust/src/commands/location.rs
 - rust/src/commands/mate.rs
 - rust/src/commands/mod.rs
 - rust/src/commands/move_item.rs
@@ -56,10 +58,12 @@ files:
 - rust/src/commands/quote_style.rs
 - rust/src/commands/remove.rs
 - rust/src/commands/rename.rs
+- rust/src/commands/schema.rs
 - rust/src/commands/selectors.rs
 - rust/src/commands/set.rs
 - rust/src/commands/sort.rs
 - rust/src/commands/sort_keys.rs
+- rust/src/commands/unique.rs
 - rust/src/commands/version.rs
 - rust/src/didyoumean.rs
 - rust/src/document/condition.rs
@@ -67,15 +71,18 @@ files:
 - rust/src/document/get.rs
 - rust/src/document/insert.rs
 - rust/src/document/mod.rs
+- rust/src/document/schema.rs
 - rust/src/document/set.rs
 - rust/src/document/sort.rs
 - rust/src/document/style.rs
+- rust/src/document/unique.rs
 - rust/src/error.rs
 - rust/src/ffi.rs
 - rust/src/json.rs
 - rust/src/lib.rs
 - rust/src/main.rs
 - rust/src/quote_style.rs
+- rust/src/schema.rs
 - rust/src/selector.rs
 - rust/src/syntax.rs
 - rust/src/yaml_writer.rs