yerba 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63abf64d4cc9319d72226b4c0a01757e2ef3770f3b5eb5d50691f9dba8d5541c
-  data.tar.gz: c809e6afbcf9dac67783853cab1b34017458204eadfc2a58bf82cf6b4d58afdd
+  metadata.gz: bb111282dd32e6a5bf4f79fc20fb71b1e4f40f56424b27ee74d14e581ca4f645
+  data.tar.gz: 6e3e5e7066e624e3263beaee6c76cebfc02c4ab645c282bfc8760264f5e19ae3
 SHA512:
-  metadata.gz: a6df761da07e009e2207f66d1fdc745733e3575e3faa5a1708d7d51ac37f03ac5cbd0f567962ed8e747e79396eed486794131915c1cf5350d1e82dc6451a90f7
-  data.tar.gz: ae74066e2fa54fc7e6eaa8defd68e786e18ab5bc871ba48996fb35536543fd7ef9f9e330d20855846a43d8e9718ba9d957a165c37c4391fcdb43984492f5d4b0
+  metadata.gz: 6d489126e1fbec945069ad81e6b16775a562133364a9a196061d7024248c155ef72e11c73ffcd292bf69ddf601545ba32087cce155d64f3673a91487b2a0a0d1
+  data.tar.gz: 75403eab424bfd79654703fc43640ee45f5e8b9f0142805e4fce938bb27c5bc510046d602ccd1a8c2be082c749a29454fd15aae2f1b2de90c05c6d22bd04dd0a

data/lib/yerba/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Yerba
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "yerba"
-version = "0.6.0"
+version = "0.6.1"
 edition = "2021"
 authors = ["Marco Roth <marco.roth@intergga.ch>"]
 description = "YAML Editing and Refactoring with Better Accuracy"

data/rust/src/document/style.rs

@@ -674,6 +674,23 @@ impl Document {
     self.root.descendants_with_tokens().any(|element| element.kind() == SyntaxKind::DIRECTIVES_END)
   }
 
+  pub fn directive_locations(&self) -> Vec<(usize, usize)> {
+    let source = self.root.text().to_string();
+
+    self
+      .root
+      .descendants_with_tokens()
+      .filter(|element| element.kind() == SyntaxKind::DIRECTIVES_END)
+      .map(|element| {
+        let offset: usize = element.text_range().start().into();
+        let line = source[..offset].matches('\n').count() + 1;
+        let column = offset - source[..offset].rfind('\n').map(|position| position + 1).unwrap_or(0) + 1;
+
+        (line, column)
+      })
+      .collect()
+  }
+
   pub fn ensure_directives(&mut self) -> Result<(), YerbaError> {
     if self.has_directives_marker() {
       return Ok(());

data/rust/src/yerbafile.rs

@@ -66,6 +66,8 @@ pub struct DirectivesConfig {
   pub ensure: bool,
   #[serde(default)]
   pub remove: bool,
+  #[serde(default)]
+  pub max: Option<usize>,
 }
 
 #[derive(Debug, Clone, Deserialize)]
@@ -675,6 +677,21 @@ fn execute_step(document: &mut Document, step: &PipelineStep, base_path: Option<
         return Err(YerbaError::ParseError("directives: ensure and remove are mutually exclusive".to_string()));
       }
 
+      if let Some(max) = config.max {
+        let locations = document.directive_locations();
+
+        if locations.len() > max {
+          let positions: Vec<String> = locations.iter().map(|(line, col)| format!("{}:{}", line, col)).collect();
+
+          return Err(YerbaError::ParseError(format!(
+            "found {} directive markers (---) at {}, expected at most {}",
+            locations.len(),
+            positions.join(", "),
+            max
+          )));
+        }
+      }
+
       if config.ensure {
         document.ensure_directives()
       } else if config.remove {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yerba
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Marco Roth