yerba 0.8.0 → 0.9.0

data/rust/src/yerbafile.rs

@@ -42,6 +42,7 @@ pub enum PipelineStep {
   Unique(UniqueConfig),
   Schema(SchemaConfig),
   FinalNewline(FinalNewlineConfig),
+  Escapes(EscapesConfig),
 }
 
 #[derive(Debug, Clone, Deserialize)]
@@ -59,6 +60,12 @@ pub struct BlankLinesConfig {
   #[serde(default)]
   pub path: Option<String>,
   pub count: usize,
+  #[serde(default)]
+  pub before: Vec<String>,
+  #[serde(default)]
+  pub after: Vec<String>,
+  #[serde(default)]
+  pub skip_empty: bool,
 }
 
 #[derive(Debug, Clone, Deserialize)]
@@ -102,6 +109,12 @@ pub struct FinalNewlineConfig {
   pub count: usize,
 }
 
+#[derive(Debug, Clone, Deserialize)]
+pub struct EscapesConfig {
+  #[serde(default)]
+  pub path: Option<String>,
+}
+
 fn default_one() -> usize {
   1
 }
@@ -199,13 +212,18 @@ impl<'de> Deserialize<'de> for PipelineStep {
       return Ok(PipelineStep::Schema(config));
     }
 
+    if let Some(value) = mapping.get(yaml_serde::Value::String("escapes".to_string())) {
+      let config: EscapesConfig = yaml_serde::from_value(value.clone()).map_err(serde::de::Error::custom)?;
+      return Ok(PipelineStep::Escapes(config));
+    }
+
     if let Some(value) = mapping.get(yaml_serde::Value::String("final_newline".to_string())) {
       let config: FinalNewlineConfig = yaml_serde::from_value(value.clone()).map_err(serde::de::Error::custom)?;
       return Ok(PipelineStep::FinalNewline(config));
     }
 
     Err(serde::de::Error::custom(
-      "unknown pipeline step: expected sort_keys, quote_style, collection_style, sequence_indent, set, insert, delete, rename, remove, blank_lines, sort, directives, unique, schema, or final_newline",
+      "unknown pipeline step: expected sort_keys, quote_style, collection_style, sequence_indent, set, insert, delete, rename, remove, blank_lines, sort, directives, unique, schema, escapes, or final_newline",
     ))
   }
 }
@@ -246,6 +264,8 @@ pub struct SetConfig {
   pub value: String,
   #[serde(default)]
   pub condition: Option<String>,
+  #[serde(default)]
+  pub plain: bool,
 }
 
 #[derive(Debug, Clone, Deserialize)]
@@ -254,6 +274,8 @@ pub struct InsertConfig {
   pub value: String,
   #[serde(default)]
   pub condition: Option<String>,
+  #[serde(default)]
+  pub plain: bool,
 }
 
 #[derive(Debug, Clone, Deserialize)]
@@ -432,6 +454,14 @@ impl Yerbafile {
 
     let original = document.to_string();
 
+    if let Some(error) = control_character_error(&original) {
+      return RuleResult {
+        file: file.to_string(),
+        changed: false,
+        error: Some(error),
+      };
+    }
+
     if run_global {
       if let Err(error) = execute_pipeline(&mut document, &self.pipeline, None, file, self) {
         return RuleResult {
@@ -513,6 +543,14 @@ impl Yerbafile {
 
     let original = document.to_string();
 
+    if let Some(error) = control_character_error(&original) {
+      return RuleResult {
+        file: file.to_string(),
+        changed: false,
+        error: Some(error),
+      };
+    }
+
     if let Err(error) = execute_pipeline(&mut document, &self.pipeline, None, file, self) {
       return RuleResult {
         file: file.to_string(),
@@ -574,6 +612,11 @@ impl Yerbafile {
 
   pub fn apply_to_document(&self, document: &mut Document, file_path: &str) -> Result<bool, YerbaError> {
     let original = document.to_string();
+
+    if let Some(error) = control_character_error(&original) {
+      return Err(error);
+    }
+
     let relative_path = self.relativize_path(file_path);
     let match_path = relative_path.as_deref().unwrap_or(file_path);
 
@@ -603,6 +646,12 @@ impl Yerbafile {
   }
 }
 
+fn control_character_error(source: &str) -> Option<YerbaError> {
+  let found = crate::validation::find_control_characters(source);
+
+  (!found.is_empty()).then_some(YerbaError::ControlCharacters(found))
+}
+
 fn execute_pipeline(document: &mut Document, steps: &[PipelineStep], base_path: Option<&str>, file: &str, yerbafile: &Yerbafile) -> Result<(), YerbaError> {
   use crate::document::style::StyleEnforcement;
 
@@ -704,7 +753,11 @@ fn execute_step(document: &mut Document, step: &PipelineStep, base_path: Option<
         }
       }
 
-      document.set(&full_path, &config.value)
+      if config.plain {
+        document.set_plain(&full_path, &config.value)
+      } else {
+        document.set(&full_path, &config.value)
+      }
     }
 
     PipelineStep::Insert(config) => {
@@ -718,7 +771,13 @@ fn execute_step(document: &mut Document, step: &PipelineStep, base_path: Option<
         }
       }
 
-      document.insert_into(&full_path, &config.value, crate::InsertPosition::Last)
+      let value = if config.plain {
+        config.value.clone()
+      } else {
+        crate::syntax::quote_scalar(&config.value)
+      };
+
+      document.insert_into(&full_path, &value, crate::InsertPosition::Last)
     }
 
     PipelineStep::Delete(config) => {
@@ -784,7 +843,13 @@ fn execute_step(document: &mut Document, step: &PipelineStep, base_path: Option<
     PipelineStep::BlankLines(config) => {
       let full_path = resolve_step_path(base_path, config.path.as_deref());
 
-      document.enforce_blank_lines(&full_path, config.count)
+      let options = crate::BlankLineOptions {
+        before: config.before.clone(),
+        after: config.after.clone(),
+        skip_empty: config.skip_empty,
+      };
+
+      document.enforce_blank_lines_with(&full_path, config.count, &options)
     }
 
     PipelineStep::Sort(config) => {
@@ -848,6 +913,13 @@ fn execute_step(document: &mut Document, step: &PipelineStep, base_path: Option<
     }
 
     PipelineStep::FinalNewline(config) => document.enforce_final_newline(config.count),
+
+    PipelineStep::Escapes(config) => {
+      let full_path = resolve_step_path(base_path, config.path.as_deref());
+      let scope = if full_path.is_empty() { None } else { Some(full_path.as_str()) };
+
+      document.decode_escapes(scope).map(|_| ())
+    }
   }
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yerba
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Marco Roth
@@ -63,6 +63,7 @@ files:
 - rust/src/commands/set.rs
 - rust/src/commands/sort.rs
 - rust/src/commands/sort_keys.rs
+- rust/src/commands/ui.rs
 - rust/src/commands/unique.rs
 - rust/src/commands/version.rs
 - rust/src/didyoumean.rs
@@ -85,6 +86,7 @@ files:
 - rust/src/schema.rs
 - rust/src/selector.rs
 - rust/src/syntax.rs
+- rust/src/validation.rs
 - rust/src/yaml_writer.rs
 - rust/src/yerbafile.rs
 - sig/yerba.rbs