Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove deprecated filters: leaf_paths, recurse_down #2666

Merged
merged 1 commit into from
Jul 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions docs/content/manual/manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1141,7 +1141,7 @@ sections:
input: 'null'
output: ['"{\"file\":\"<top-level>\",\"line\":1}"']

- title: "`paths`, `paths(node_filter)`, `leaf_paths`"
- title: "`paths`, `paths(node_filter)`"
body: |

`paths` outputs the paths to all the elements in its input
Expand All @@ -1152,9 +1152,6 @@ sections:
That is, `paths(numbers)` outputs the paths to all numeric
values.

`leaf_paths` is an alias of `paths(scalars)`; `leaf_paths` is
*deprecated* and will be removed in the next major release.

examples:
- program: '[paths]'
input: '[1,[[],{"a":2}]]'
Expand Down Expand Up @@ -1738,7 +1735,7 @@ sections:
output: ['24']


- title: "`recurse(f)`, `recurse`, `recurse(f; condition)`, `recurse_down`"
- title: "`recurse(f)`, `recurse`, `recurse(f; condition)`"
body: |

The `recurse(f)` function allows you to search through a
Expand Down Expand Up @@ -1772,10 +1769,6 @@ sections:
to generate all the integers, at least in principle, one
could write `recurse(.+1; true)`.

For legacy reasons, `recurse_down` exists as an alias to
calling `recurse` without arguments. This alias is considered
*deprecated* and will be removed in the next major release.

The recursive calls in `recurse` will not consume additional
memory whenever `f` produces at most a single output for each
input.
Expand Down
2 changes: 0 additions & 2 deletions src/builtin.jq
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ def map_values(f): .[] |= f;
def recurse(f): def r: ., (f | r); r;
def recurse(f; cond): def r: ., (f | select(cond) | r); r;
def recurse: recurse(.[]?);
def recurse_down: recurse;

def to_entries: [keys_unsorted[] as $k | {key: $k, value: .[$k]}];
def from_entries: map({(.key // .Key // .name // .Name): (if has("value") then .value else .Value end)}) | add | .//={};
Expand All @@ -62,7 +61,6 @@ def strings: select(type == "string");
def nulls: select(. == null);
def values: select(. != null);
def scalars: select(type|. != "array" and . != "object");
def leaf_paths: paths(scalars);
def join($x): reduce .[] as $i (null;
(if .==null then "" else .+$x end) +
($i | if type=="boolean" or type=="number" then tostring else .//"" end)
Expand Down
4 changes: 0 additions & 4 deletions tests/jq.test
Original file line number Diff line number Diff line change
Expand Up @@ -952,10 +952,6 @@ path(.a[path(.b)[0]])
[1,[[],{"a":2}]]
[[0],[1],[1,0],[1,1],[1,1,"a"]]

[leaf_paths]
[1,[[],{"a":2}]]
[[0],[1,1,"a"]]

["foo",1] as $p | getpath($p), setpath($p; 20), delpaths([$p])
{"bar": 42, "foo": ["a", "b", "c", "d"]}
"b"
Expand Down