yerba 0.3.0-aarch64-linux-gnu → 0.4.1-aarch64-linux-gnu
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +93 -8
- data/exe/aarch64-linux-gnu/yerba +0 -0
- data/ext/yerba/extconf.rb +22 -3
- data/ext/yerba/include/yerba.h +32 -9
- data/ext/yerba/yerba.c +133 -25
- data/lib/yerba/3.2/yerba.so +0 -0
- data/lib/yerba/3.3/yerba.so +0 -0
- data/lib/yerba/3.4/yerba.so +0 -0
- data/lib/yerba/4.0/yerba.so +0 -0
- data/lib/yerba/collection.rb +35 -0
- data/lib/yerba/document.rb +45 -3
- data/lib/yerba/query_result.rb +50 -0
- data/lib/yerba/sequence.rb +187 -1
- data/lib/yerba/version.rb +1 -1
- data/lib/yerba/yerbafile.rb +45 -0
- data/lib/yerba.rb +2 -0
- data/rust/Cargo.lock +3 -1
- data/rust/Cargo.toml +3 -2
- data/rust/cbindgen.toml +1 -0
- data/rust/rustfmt.toml +1 -1
- data/rust/src/commands/apply.rs +11 -2
- data/rust/src/commands/blank_lines.rs +1 -4
- data/rust/src/commands/check.rs +11 -2
- data/rust/src/commands/directives.rs +61 -0
- data/rust/src/commands/get.rs +5 -22
- data/rust/src/commands/mod.rs +16 -18
- data/rust/src/commands/quote_style.rs +12 -6
- data/rust/src/commands/selectors.rs +3 -19
- data/rust/src/commands/sort.rs +22 -157
- data/rust/src/didyoumean.rs +2 -4
- data/rust/src/document/condition.rs +139 -0
- data/rust/src/document/delete.rs +91 -0
- data/rust/src/document/get.rs +262 -0
- data/rust/src/document/insert.rs +384 -0
- data/rust/src/document/mod.rs +784 -0
- data/rust/src/document/set.rs +100 -0
- data/rust/src/document/sort.rs +639 -0
- data/rust/src/document/style.rs +473 -0
- data/rust/src/error.rs +24 -6
- data/rust/src/ffi.rs +272 -518
- data/rust/src/json.rs +1 -7
- data/rust/src/lib.rs +88 -2
- data/rust/src/main.rs +2 -0
- data/rust/src/quote_style.rs +83 -7
- data/rust/src/selector.rs +2 -7
- data/rust/src/syntax.rs +41 -21
- data/rust/src/yerbafile.rs +86 -19
- metadata +13 -3
- data/rust/src/document.rs +0 -2304
|
@@ -0,0 +1,639 @@
|
|
|
1
|
+
use super::*;
|
|
2
|
+
|
|
3
|
+
impl Document {
|
|
4
|
+
pub fn move_item(&mut self, dot_path: &str, from: usize, to: usize) -> Result<(), YerbaError> {
|
|
5
|
+
if from == to {
|
|
6
|
+
return Ok(());
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
let current_node = self.navigate(dot_path)?;
|
|
10
|
+
|
|
11
|
+
let sequence = current_node
|
|
12
|
+
.descendants()
|
|
13
|
+
.find_map(BlockSeq::cast)
|
|
14
|
+
.ok_or_else(|| YerbaError::NotASequence(dot_path.to_string()))?;
|
|
15
|
+
|
|
16
|
+
let entries: Vec<_> = sequence.entries().collect();
|
|
17
|
+
|
|
18
|
+
self.reorder_entries(sequence.syntax(), &entries, from, to)
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
pub fn move_key(&mut self, dot_path: &str, from: usize, to: usize) -> Result<(), YerbaError> {
|
|
22
|
+
if from == to {
|
|
23
|
+
return Ok(());
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
let current_node = self.navigate(dot_path)?;
|
|
27
|
+
|
|
28
|
+
let map = current_node
|
|
29
|
+
.descendants()
|
|
30
|
+
.find_map(BlockMap::cast)
|
|
31
|
+
.ok_or_else(|| YerbaError::SelectorNotFound(dot_path.to_string()))?;
|
|
32
|
+
|
|
33
|
+
let entries: Vec<_> = map.entries().collect();
|
|
34
|
+
|
|
35
|
+
self.reorder_entries(map.syntax(), &entries, from, to)
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
pub fn resolve_key_index(&self, dot_path: &str, reference: &str) -> Result<usize, YerbaError> {
|
|
39
|
+
let current_node = self.navigate(dot_path)?;
|
|
40
|
+
|
|
41
|
+
let map = current_node
|
|
42
|
+
.descendants()
|
|
43
|
+
.find_map(BlockMap::cast)
|
|
44
|
+
.ok_or_else(|| YerbaError::SelectorNotFound(dot_path.to_string()))?;
|
|
45
|
+
|
|
46
|
+
if let Ok(index) = reference.parse::<usize>() {
|
|
47
|
+
let length = map.entries().count();
|
|
48
|
+
|
|
49
|
+
if index >= length {
|
|
50
|
+
return Err(YerbaError::IndexOutOfBounds(index, length));
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
return Ok(index);
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
map
|
|
57
|
+
.entries()
|
|
58
|
+
.enumerate()
|
|
59
|
+
.find(|(_index, entry)| {
|
|
60
|
+
entry
|
|
61
|
+
.key()
|
|
62
|
+
.and_then(|key_node| extract_scalar_text(key_node.syntax()))
|
|
63
|
+
.map(|key_text| key_text == reference)
|
|
64
|
+
.unwrap_or(false)
|
|
65
|
+
})
|
|
66
|
+
.map(|(index, _entry)| index)
|
|
67
|
+
.ok_or_else(|| YerbaError::SelectorNotFound(format!("{} key '{}'", dot_path, reference)))
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
pub fn resolve_sequence_index(&self, dot_path: &str, reference: &str) -> Result<usize, YerbaError> {
|
|
71
|
+
let current_node = self.navigate(dot_path)?;
|
|
72
|
+
|
|
73
|
+
let sequence = current_node
|
|
74
|
+
.descendants()
|
|
75
|
+
.find_map(BlockSeq::cast)
|
|
76
|
+
.ok_or_else(|| YerbaError::NotASequence(dot_path.to_string()))?;
|
|
77
|
+
|
|
78
|
+
if let Ok(index) = reference.parse::<usize>() {
|
|
79
|
+
let length = sequence.entries().count();
|
|
80
|
+
|
|
81
|
+
if index >= length {
|
|
82
|
+
return Err(YerbaError::IndexOutOfBounds(index, length));
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
return Ok(index);
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
if crate::selector::Selector::parse(reference).is_relative() {
|
|
89
|
+
return sequence
|
|
90
|
+
.entries()
|
|
91
|
+
.enumerate()
|
|
92
|
+
.find(|(_index, entry)| self.evaluate_condition_on_node(entry.syntax(), reference))
|
|
93
|
+
.map(|(index, _entry)| index)
|
|
94
|
+
.ok_or_else(|| YerbaError::SelectorNotFound(format!("{} condition '{}'", dot_path, reference)));
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
sequence
|
|
98
|
+
.entries()
|
|
99
|
+
.enumerate()
|
|
100
|
+
.find(|(_index, entry)| {
|
|
101
|
+
entry
|
|
102
|
+
.flow()
|
|
103
|
+
.and_then(|flow| extract_scalar_text(flow.syntax()))
|
|
104
|
+
.map(|text| text == reference)
|
|
105
|
+
.unwrap_or(false)
|
|
106
|
+
})
|
|
107
|
+
.map(|(index, _entry)| index)
|
|
108
|
+
.ok_or_else(|| YerbaError::SelectorNotFound(format!("{} item '{}'", dot_path, reference)))
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
pub fn validate_sort_keys(&self, dot_path: &str, key_order: &[&str]) -> Result<(), YerbaError> {
|
|
112
|
+
if let Some(sequence_path) = strip_bracket_suffix(dot_path) {
|
|
113
|
+
return self.validate_each_sort_keys(sequence_path, key_order);
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
let current_node = self.navigate(dot_path)?;
|
|
117
|
+
|
|
118
|
+
let map = current_node
|
|
119
|
+
.descendants()
|
|
120
|
+
.find_map(BlockMap::cast)
|
|
121
|
+
.ok_or_else(|| YerbaError::SelectorNotFound(dot_path.to_string()))?;
|
|
122
|
+
|
|
123
|
+
let unknown_keys: Vec<String> = map
|
|
124
|
+
.entries()
|
|
125
|
+
.filter_map(|entry| entry.key().and_then(|key_node| extract_scalar_text(key_node.syntax())))
|
|
126
|
+
.filter(|key_name| !key_order.contains(&key_name.as_str()))
|
|
127
|
+
.collect();
|
|
128
|
+
|
|
129
|
+
if unknown_keys.is_empty() {
|
|
130
|
+
Ok(())
|
|
131
|
+
} else {
|
|
132
|
+
Err(YerbaError::UnknownKeys(unknown_keys))
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
pub fn sort_keys(&mut self, dot_path: &str, key_order: &[&str]) -> Result<(), YerbaError> {
|
|
137
|
+
if let Some(sequence_path) = strip_bracket_suffix(dot_path) {
|
|
138
|
+
return self.sort_each_keys(sequence_path, key_order);
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
let current_node = self.navigate(dot_path)?;
|
|
142
|
+
|
|
143
|
+
let map = current_node
|
|
144
|
+
.descendants()
|
|
145
|
+
.find_map(BlockMap::cast)
|
|
146
|
+
.ok_or_else(|| YerbaError::SelectorNotFound(dot_path.to_string()))?;
|
|
147
|
+
|
|
148
|
+
let entries: Vec<_> = map.entries().collect();
|
|
149
|
+
|
|
150
|
+
if entries.len() <= 1 {
|
|
151
|
+
return Ok(());
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
let (groups, range) = collect_groups_with_range(map.syntax());
|
|
155
|
+
|
|
156
|
+
let mut keyed: Vec<(String, EntryGroup)> = entries
|
|
157
|
+
.iter()
|
|
158
|
+
.zip(groups)
|
|
159
|
+
.map(|(entry, group)| {
|
|
160
|
+
let key_name = entry.key().and_then(|key_node| extract_scalar_text(key_node.syntax())).unwrap_or_default();
|
|
161
|
+
(key_name, group)
|
|
162
|
+
})
|
|
163
|
+
.collect();
|
|
164
|
+
|
|
165
|
+
let original_keys: Vec<String> = keyed.iter().map(|(key, _)| key.clone()).collect();
|
|
166
|
+
|
|
167
|
+
keyed.sort_by(|(key_a, _), (key_b, _)| {
|
|
168
|
+
let position_a = key_order.iter().position(|&key| key == key_a);
|
|
169
|
+
let position_b = key_order.iter().position(|&key| key == key_b);
|
|
170
|
+
|
|
171
|
+
match (position_a, position_b) {
|
|
172
|
+
(Some(a), Some(b)) => a.cmp(&b),
|
|
173
|
+
(Some(_), None) => std::cmp::Ordering::Less,
|
|
174
|
+
(None, Some(_)) => std::cmp::Ordering::Greater,
|
|
175
|
+
(None, None) => {
|
|
176
|
+
let original_a = original_keys.iter().position(|key| key == key_a).unwrap();
|
|
177
|
+
let original_b = original_keys.iter().position(|key| key == key_b).unwrap();
|
|
178
|
+
original_a.cmp(&original_b)
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
});
|
|
182
|
+
|
|
183
|
+
let sorted_keys: Vec<&str> = keyed.iter().map(|(key, _)| key.as_str()).collect();
|
|
184
|
+
let orig_refs: Vec<&str> = original_keys.iter().map(|key| key.as_str()).collect();
|
|
185
|
+
|
|
186
|
+
if sorted_keys == orig_refs {
|
|
187
|
+
return Ok(());
|
|
188
|
+
}
|
|
189
|
+
|
|
190
|
+
let indent = entries.get(1).map(|entry| preceding_whitespace_indent(entry.syntax())).unwrap_or_default();
|
|
191
|
+
|
|
192
|
+
let sorted_groups: Vec<EntryGroup> = keyed.into_iter().map(|(_, group)| group).collect();
|
|
193
|
+
let map_text = rebuild_from_groups(&sorted_groups, &indent, false);
|
|
194
|
+
|
|
195
|
+
self.apply_edit(range, &map_text)
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
pub fn sort_each_keys(&mut self, dot_path: &str, key_order: &[&str]) -> Result<(), YerbaError> {
|
|
199
|
+
let nodes = if dot_path.is_empty() {
|
|
200
|
+
match self.navigate(dot_path) {
|
|
201
|
+
Ok(node) => vec![node],
|
|
202
|
+
Err(_) => return Ok(()),
|
|
203
|
+
}
|
|
204
|
+
} else {
|
|
205
|
+
let found = self.navigate_all(dot_path);
|
|
206
|
+
if found.is_empty() {
|
|
207
|
+
return Ok(());
|
|
208
|
+
}
|
|
209
|
+
found
|
|
210
|
+
};
|
|
211
|
+
|
|
212
|
+
let mut edits: Vec<(TextRange, String)> = Vec::new();
|
|
213
|
+
|
|
214
|
+
for current_node in &nodes {
|
|
215
|
+
let sequence = match current_node.descendants().find_map(BlockSeq::cast) {
|
|
216
|
+
Some(sequence) => sequence,
|
|
217
|
+
None => continue,
|
|
218
|
+
};
|
|
219
|
+
|
|
220
|
+
for entry in sequence.entries() {
|
|
221
|
+
let entry_node = entry.syntax();
|
|
222
|
+
|
|
223
|
+
let map = match entry_node.descendants().find_map(BlockMap::cast) {
|
|
224
|
+
Some(map) => map,
|
|
225
|
+
None => continue,
|
|
226
|
+
};
|
|
227
|
+
|
|
228
|
+
let entries: Vec<_> = map.entries().collect();
|
|
229
|
+
|
|
230
|
+
if entries.len() <= 1 {
|
|
231
|
+
continue;
|
|
232
|
+
}
|
|
233
|
+
|
|
234
|
+
let (groups, group_range) = collect_groups_with_range(map.syntax());
|
|
235
|
+
|
|
236
|
+
let mut keyed: Vec<(String, EntryGroup)> = entries
|
|
237
|
+
.iter()
|
|
238
|
+
.zip(groups)
|
|
239
|
+
.map(|(entry, group)| {
|
|
240
|
+
let key_name = entry.key().and_then(|key_node| extract_scalar_text(key_node.syntax())).unwrap_or_default();
|
|
241
|
+
(key_name, group)
|
|
242
|
+
})
|
|
243
|
+
.collect();
|
|
244
|
+
|
|
245
|
+
let original_keys: Vec<String> = keyed.iter().map(|(key, _)| key.clone()).collect();
|
|
246
|
+
|
|
247
|
+
keyed.sort_by(|(key_a, _), (key_b, _)| {
|
|
248
|
+
let position_a = key_order.iter().position(|&key| key == key_a);
|
|
249
|
+
let position_b = key_order.iter().position(|&key| key == key_b);
|
|
250
|
+
|
|
251
|
+
match (position_a, position_b) {
|
|
252
|
+
(Some(a), Some(b)) => a.cmp(&b),
|
|
253
|
+
(Some(_), None) => std::cmp::Ordering::Less,
|
|
254
|
+
(None, Some(_)) => std::cmp::Ordering::Greater,
|
|
255
|
+
|
|
256
|
+
(None, None) => {
|
|
257
|
+
let original_a = original_keys.iter().position(|key| key == key_a).unwrap();
|
|
258
|
+
let original_b = original_keys.iter().position(|key| key == key_b).unwrap();
|
|
259
|
+
|
|
260
|
+
original_a.cmp(&original_b)
|
|
261
|
+
}
|
|
262
|
+
}
|
|
263
|
+
});
|
|
264
|
+
|
|
265
|
+
let sorted_keys: Vec<&str> = keyed.iter().map(|(key, _)| key.as_str()).collect();
|
|
266
|
+
let orig_refs: Vec<&str> = original_keys.iter().map(|key| key.as_str()).collect();
|
|
267
|
+
|
|
268
|
+
if sorted_keys == orig_refs {
|
|
269
|
+
continue;
|
|
270
|
+
}
|
|
271
|
+
|
|
272
|
+
let indent = entries.get(1).map(|entry| preceding_whitespace_indent(entry.syntax())).unwrap_or_default();
|
|
273
|
+
|
|
274
|
+
let sorted_groups: Vec<EntryGroup> = keyed.into_iter().map(|(_, group)| group).collect();
|
|
275
|
+
let map_text = rebuild_from_groups(&sorted_groups, &indent, false);
|
|
276
|
+
edits.push((group_range, map_text));
|
|
277
|
+
}
|
|
278
|
+
}
|
|
279
|
+
|
|
280
|
+
if edits.is_empty() {
|
|
281
|
+
return Ok(());
|
|
282
|
+
}
|
|
283
|
+
|
|
284
|
+
edits.reverse();
|
|
285
|
+
|
|
286
|
+
let source = self.root.text().to_string();
|
|
287
|
+
let mut new_source = source;
|
|
288
|
+
|
|
289
|
+
for (range, replacement) in edits {
|
|
290
|
+
let start: usize = range.start().into();
|
|
291
|
+
let end: usize = range.end().into();
|
|
292
|
+
|
|
293
|
+
new_source.replace_range(start..end, &replacement);
|
|
294
|
+
}
|
|
295
|
+
|
|
296
|
+
let path = self.path.take();
|
|
297
|
+
*self = Self::parse(&new_source)?;
|
|
298
|
+
self.path = path;
|
|
299
|
+
|
|
300
|
+
Ok(())
|
|
301
|
+
}
|
|
302
|
+
|
|
303
|
+
pub fn validate_each_sort_keys(&self, dot_path: &str, key_order: &[&str]) -> Result<(), YerbaError> {
|
|
304
|
+
let nodes = if dot_path.is_empty() {
|
|
305
|
+
match self.navigate(dot_path) {
|
|
306
|
+
Ok(node) => vec![node],
|
|
307
|
+
Err(_) => return Ok(()),
|
|
308
|
+
}
|
|
309
|
+
} else {
|
|
310
|
+
let found = self.navigate_all(dot_path);
|
|
311
|
+
if found.is_empty() {
|
|
312
|
+
return Ok(());
|
|
313
|
+
}
|
|
314
|
+
found
|
|
315
|
+
};
|
|
316
|
+
|
|
317
|
+
let mut all_unknown: Vec<String> = Vec::new();
|
|
318
|
+
|
|
319
|
+
for current_node in &nodes {
|
|
320
|
+
let sequence = match current_node.descendants().find_map(BlockSeq::cast) {
|
|
321
|
+
Some(sequence) => sequence,
|
|
322
|
+
None => continue,
|
|
323
|
+
};
|
|
324
|
+
|
|
325
|
+
for entry in sequence.entries() {
|
|
326
|
+
if let Some(map) = entry.syntax().descendants().find_map(BlockMap::cast) {
|
|
327
|
+
for map_entry in map.entries() {
|
|
328
|
+
if let Some(key_name) = map_entry.key().and_then(|key_node| extract_scalar_text(key_node.syntax())) {
|
|
329
|
+
if !key_order.contains(&key_name.as_str()) && !all_unknown.contains(&key_name) {
|
|
330
|
+
all_unknown.push(key_name);
|
|
331
|
+
}
|
|
332
|
+
}
|
|
333
|
+
}
|
|
334
|
+
}
|
|
335
|
+
}
|
|
336
|
+
}
|
|
337
|
+
|
|
338
|
+
if all_unknown.is_empty() {
|
|
339
|
+
Ok(())
|
|
340
|
+
} else {
|
|
341
|
+
Err(YerbaError::UnknownKeys(all_unknown))
|
|
342
|
+
}
|
|
343
|
+
}
|
|
344
|
+
|
|
345
|
+
pub fn sort_items(&mut self, dot_path: &str, sort_fields: &[SortField], case_sensitive: bool) -> Result<(), YerbaError> {
|
|
346
|
+
if dot_path.contains("[].") {
|
|
347
|
+
return self.sort_each_items(dot_path, sort_fields, case_sensitive);
|
|
348
|
+
}
|
|
349
|
+
|
|
350
|
+
let current_node = self.navigate(dot_path)?;
|
|
351
|
+
|
|
352
|
+
let sequence = match current_node.descendants().find_map(BlockSeq::cast) {
|
|
353
|
+
Some(sequence) => sequence,
|
|
354
|
+
None => return Ok(()),
|
|
355
|
+
};
|
|
356
|
+
|
|
357
|
+
let entries: Vec<_> = sequence.entries().collect();
|
|
358
|
+
|
|
359
|
+
if entries.len() <= 1 {
|
|
360
|
+
return Ok(());
|
|
361
|
+
}
|
|
362
|
+
|
|
363
|
+
let (groups, range) = collect_groups_with_range(sequence.syntax());
|
|
364
|
+
|
|
365
|
+
let mut sortable: Vec<(Vec<String>, EntryGroup)> = entries
|
|
366
|
+
.iter()
|
|
367
|
+
.zip(groups)
|
|
368
|
+
.map(|(entry, group)| {
|
|
369
|
+
let sort_values = if sort_fields.is_empty() {
|
|
370
|
+
vec![entry.flow().and_then(|flow| extract_scalar_text(flow.syntax())).unwrap_or_default()]
|
|
371
|
+
} else {
|
|
372
|
+
sort_fields
|
|
373
|
+
.iter()
|
|
374
|
+
.map(|field| {
|
|
375
|
+
if field.path.is_empty() {
|
|
376
|
+
entry.flow().and_then(|flow| extract_scalar_text(flow.syntax())).unwrap_or_default()
|
|
377
|
+
} else {
|
|
378
|
+
let nodes = navigate_from_node(entry.syntax(), &field.path);
|
|
379
|
+
nodes.first().and_then(extract_scalar_text).unwrap_or_default()
|
|
380
|
+
}
|
|
381
|
+
})
|
|
382
|
+
.collect()
|
|
383
|
+
};
|
|
384
|
+
|
|
385
|
+
(sort_values, group)
|
|
386
|
+
})
|
|
387
|
+
.collect();
|
|
388
|
+
|
|
389
|
+
let original_bodies: Vec<String> = sortable.iter().map(|(_, group)| group.body.clone()).collect();
|
|
390
|
+
|
|
391
|
+
sortable.sort_by(|(values_a, _), (values_b, _)| {
|
|
392
|
+
for (index, field) in sort_fields.iter().enumerate().take(values_a.len()) {
|
|
393
|
+
let value_a = &values_a[index];
|
|
394
|
+
let value_b = &values_b[index];
|
|
395
|
+
|
|
396
|
+
let ordering = if case_sensitive {
|
|
397
|
+
value_a.cmp(value_b)
|
|
398
|
+
} else {
|
|
399
|
+
value_a.to_lowercase().cmp(&value_b.to_lowercase())
|
|
400
|
+
};
|
|
401
|
+
|
|
402
|
+
let ordering = if field.ascending { ordering } else { ordering.reverse() };
|
|
403
|
+
|
|
404
|
+
if ordering != std::cmp::Ordering::Equal {
|
|
405
|
+
return ordering;
|
|
406
|
+
}
|
|
407
|
+
}
|
|
408
|
+
|
|
409
|
+
if sort_fields.is_empty() && !values_a.is_empty() && !values_b.is_empty() {
|
|
410
|
+
return if case_sensitive {
|
|
411
|
+
values_a[0].cmp(&values_b[0])
|
|
412
|
+
} else {
|
|
413
|
+
values_a[0].to_lowercase().cmp(&values_b[0].to_lowercase())
|
|
414
|
+
};
|
|
415
|
+
}
|
|
416
|
+
|
|
417
|
+
std::cmp::Ordering::Equal
|
|
418
|
+
});
|
|
419
|
+
|
|
420
|
+
let sorted_bodies: Vec<String> = sortable.iter().map(|(_, group)| group.body.clone()).collect();
|
|
421
|
+
|
|
422
|
+
if sorted_bodies == original_bodies {
|
|
423
|
+
return Ok(());
|
|
424
|
+
}
|
|
425
|
+
|
|
426
|
+
let indent = entries.get(1).map(|entry| preceding_whitespace_indent(entry.syntax())).unwrap_or_default();
|
|
427
|
+
|
|
428
|
+
let sorted_groups: Vec<EntryGroup> = sortable.into_iter().map(|(_, group)| group).collect();
|
|
429
|
+
let sequence_text = rebuild_from_groups(&sorted_groups, &indent, true);
|
|
430
|
+
|
|
431
|
+
self.apply_edit(range, &sequence_text)
|
|
432
|
+
}
|
|
433
|
+
|
|
434
|
+
fn sort_each_items(&mut self, dot_path: &str, sort_fields: &[SortField], case_sensitive: bool) -> Result<(), YerbaError> {
|
|
435
|
+
let (parent_path, child_path) = if let Some(last_bracket) = dot_path.rfind("[].") {
|
|
436
|
+
(&dot_path[..last_bracket + 2], &dot_path[last_bracket + 3..])
|
|
437
|
+
} else {
|
|
438
|
+
(dot_path, "")
|
|
439
|
+
};
|
|
440
|
+
|
|
441
|
+
let parent_nodes = self.navigate_all(parent_path);
|
|
442
|
+
let source = self.root.text().to_string();
|
|
443
|
+
let mut edits: Vec<(TextRange, String)> = Vec::new();
|
|
444
|
+
|
|
445
|
+
for parent_node in &parent_nodes {
|
|
446
|
+
let child_nodes = if child_path.is_empty() {
|
|
447
|
+
vec![parent_node.clone()]
|
|
448
|
+
} else {
|
|
449
|
+
navigate_from_node(parent_node, child_path)
|
|
450
|
+
};
|
|
451
|
+
|
|
452
|
+
for child_node in &child_nodes {
|
|
453
|
+
let sequence = match child_node.descendants().find_map(BlockSeq::cast) {
|
|
454
|
+
Some(sequence) => sequence,
|
|
455
|
+
None => continue,
|
|
456
|
+
};
|
|
457
|
+
|
|
458
|
+
let entries: Vec<_> = sequence.entries().collect();
|
|
459
|
+
|
|
460
|
+
if entries.len() <= 1 {
|
|
461
|
+
continue;
|
|
462
|
+
}
|
|
463
|
+
|
|
464
|
+
let (groups, group_range) = collect_groups_with_range(sequence.syntax());
|
|
465
|
+
|
|
466
|
+
let mut sortable: Vec<(Vec<String>, EntryGroup)> = entries
|
|
467
|
+
.iter()
|
|
468
|
+
.zip(groups)
|
|
469
|
+
.map(|(entry, group)| {
|
|
470
|
+
let sort_values = if sort_fields.is_empty() {
|
|
471
|
+
vec![entry.flow().and_then(|flow| extract_scalar_text(flow.syntax())).unwrap_or_default()]
|
|
472
|
+
} else {
|
|
473
|
+
sort_fields
|
|
474
|
+
.iter()
|
|
475
|
+
.map(|field| {
|
|
476
|
+
if field.path.is_empty() {
|
|
477
|
+
entry.flow().and_then(|flow| extract_scalar_text(flow.syntax())).unwrap_or_default()
|
|
478
|
+
} else {
|
|
479
|
+
let nodes = navigate_from_node(entry.syntax(), &field.path);
|
|
480
|
+
nodes.first().and_then(extract_scalar_text).unwrap_or_default()
|
|
481
|
+
}
|
|
482
|
+
})
|
|
483
|
+
.collect()
|
|
484
|
+
};
|
|
485
|
+
|
|
486
|
+
(sort_values, group)
|
|
487
|
+
})
|
|
488
|
+
.collect();
|
|
489
|
+
|
|
490
|
+
let original_bodies: Vec<String> = sortable.iter().map(|(_, group)| group.body.clone()).collect();
|
|
491
|
+
|
|
492
|
+
sortable.sort_by(|(values_a, _), (values_b, _)| {
|
|
493
|
+
for (index, field) in sort_fields.iter().enumerate().take(values_a.len()) {
|
|
494
|
+
let value_a = &values_a[index];
|
|
495
|
+
let value_b = &values_b[index];
|
|
496
|
+
|
|
497
|
+
let ordering = if case_sensitive {
|
|
498
|
+
value_a.cmp(value_b)
|
|
499
|
+
} else {
|
|
500
|
+
value_a.to_lowercase().cmp(&value_b.to_lowercase())
|
|
501
|
+
};
|
|
502
|
+
|
|
503
|
+
let ordering = if field.ascending { ordering } else { ordering.reverse() };
|
|
504
|
+
|
|
505
|
+
if ordering != std::cmp::Ordering::Equal {
|
|
506
|
+
return ordering;
|
|
507
|
+
}
|
|
508
|
+
}
|
|
509
|
+
|
|
510
|
+
if sort_fields.is_empty() && !values_a.is_empty() && !values_b.is_empty() {
|
|
511
|
+
return if case_sensitive {
|
|
512
|
+
values_a[0].cmp(&values_b[0])
|
|
513
|
+
} else {
|
|
514
|
+
values_a[0].to_lowercase().cmp(&values_b[0].to_lowercase())
|
|
515
|
+
};
|
|
516
|
+
}
|
|
517
|
+
|
|
518
|
+
std::cmp::Ordering::Equal
|
|
519
|
+
});
|
|
520
|
+
|
|
521
|
+
let sorted_bodies: Vec<String> = sortable.iter().map(|(_, group)| group.body.clone()).collect();
|
|
522
|
+
|
|
523
|
+
if sorted_bodies == original_bodies {
|
|
524
|
+
continue;
|
|
525
|
+
}
|
|
526
|
+
|
|
527
|
+
let indent = entries.get(1).map(|entry| preceding_whitespace_indent(entry.syntax())).unwrap_or_default();
|
|
528
|
+
let sorted_groups: Vec<EntryGroup> = sortable.into_iter().map(|(_, group)| group).collect();
|
|
529
|
+
let sequence_text = rebuild_from_groups(&sorted_groups, &indent, true);
|
|
530
|
+
|
|
531
|
+
edits.push((group_range, sequence_text));
|
|
532
|
+
}
|
|
533
|
+
}
|
|
534
|
+
|
|
535
|
+
if edits.is_empty() {
|
|
536
|
+
return Ok(());
|
|
537
|
+
}
|
|
538
|
+
|
|
539
|
+
edits.reverse();
|
|
540
|
+
|
|
541
|
+
let mut new_source = source;
|
|
542
|
+
|
|
543
|
+
for (range, replacement) in edits {
|
|
544
|
+
let start: usize = range.start().into();
|
|
545
|
+
let end: usize = range.end().into();
|
|
546
|
+
|
|
547
|
+
new_source.replace_range(start..end, &replacement);
|
|
548
|
+
}
|
|
549
|
+
|
|
550
|
+
let path = self.path.take();
|
|
551
|
+
*self = Self::parse(&new_source)?;
|
|
552
|
+
self.path = path;
|
|
553
|
+
|
|
554
|
+
Ok(())
|
|
555
|
+
}
|
|
556
|
+
|
|
557
|
+
pub fn reorder_items(&mut self, dot_path: &str, by: &str, desired_order: &[&str]) -> Result<(), YerbaError> {
|
|
558
|
+
let field = by.strip_prefix('.').unwrap_or(by);
|
|
559
|
+
let is_scalar = field.is_empty() || field == ".";
|
|
560
|
+
|
|
561
|
+
let items_selector = if is_scalar {
|
|
562
|
+
if dot_path.is_empty() {
|
|
563
|
+
"[]".to_string()
|
|
564
|
+
} else {
|
|
565
|
+
format!("{}[]", dot_path)
|
|
566
|
+
}
|
|
567
|
+
} else if dot_path.is_empty() {
|
|
568
|
+
format!("[].{}", field)
|
|
569
|
+
} else {
|
|
570
|
+
format!("{}[].{}", dot_path, field)
|
|
571
|
+
};
|
|
572
|
+
|
|
573
|
+
let labels: Vec<String> = match self.get_value(&items_selector) {
|
|
574
|
+
Some(serde_yaml::Value::Sequence(sequence)) => sequence
|
|
575
|
+
.iter()
|
|
576
|
+
.map(|value| match value {
|
|
577
|
+
serde_yaml::Value::String(string) => string.clone(),
|
|
578
|
+
_ => String::new(),
|
|
579
|
+
})
|
|
580
|
+
.collect(),
|
|
581
|
+
_ => return Err(YerbaError::SelectorNotFound(items_selector)),
|
|
582
|
+
};
|
|
583
|
+
|
|
584
|
+
let mut used = vec![false; labels.len()];
|
|
585
|
+
let mut moves: Vec<usize> = Vec::new();
|
|
586
|
+
|
|
587
|
+
for desired in desired_order {
|
|
588
|
+
let found = labels.iter().enumerate().find(|(index, label)| label.as_str() == *desired && !used[*index]);
|
|
589
|
+
|
|
590
|
+
if let Some((index, _)) = found {
|
|
591
|
+
moves.push(index);
|
|
592
|
+
used[index] = true;
|
|
593
|
+
} else {
|
|
594
|
+
return Err(YerbaError::SelectorNotFound(format!("no item found with {} == \"{}\"", by, desired)));
|
|
595
|
+
}
|
|
596
|
+
}
|
|
597
|
+
|
|
598
|
+
let missing: Vec<&String> = labels.iter().enumerate().filter(|(index, _)| !used[*index]).map(|(_, label)| label).collect();
|
|
599
|
+
|
|
600
|
+
if !missing.is_empty() {
|
|
601
|
+
let missing_list = missing.iter().map(|s| s.as_str()).collect::<Vec<_>>().join(", ");
|
|
602
|
+
|
|
603
|
+
return Err(YerbaError::SelectorNotFound(format!(
|
|
604
|
+
"order must specify all {} items, but {} missing: {}",
|
|
605
|
+
labels.len(),
|
|
606
|
+
missing.len(),
|
|
607
|
+
missing_list
|
|
608
|
+
)));
|
|
609
|
+
}
|
|
610
|
+
|
|
611
|
+
for target in 0..moves.len() {
|
|
612
|
+
let source = moves[target];
|
|
613
|
+
|
|
614
|
+
if source != target {
|
|
615
|
+
self.move_item(dot_path, source, target)?;
|
|
616
|
+
|
|
617
|
+
for item in moves.iter_mut().skip(target + 1) {
|
|
618
|
+
if *item >= target && *item < source {
|
|
619
|
+
*item += 1;
|
|
620
|
+
} else if *item == source {
|
|
621
|
+
*item = target;
|
|
622
|
+
}
|
|
623
|
+
}
|
|
624
|
+
}
|
|
625
|
+
}
|
|
626
|
+
|
|
627
|
+
Ok(())
|
|
628
|
+
}
|
|
629
|
+
}
|
|
630
|
+
|
|
631
|
+
fn strip_bracket_suffix(path: &str) -> Option<&str> {
|
|
632
|
+
if path == "[]" {
|
|
633
|
+
Some("")
|
|
634
|
+
} else if let Some(stripped) = path.strip_suffix(".[]") {
|
|
635
|
+
Some(stripped)
|
|
636
|
+
} else {
|
|
637
|
+
path.strip_suffix("[]")
|
|
638
|
+
}
|
|
639
|
+
}
|