Steven WdV
70ac3d6c7a
Add override behavior comments
2025-07-20 15:46:15 +02:00
Steven WdV
904215ef4d
Fix key overriding in regular maps for traversing
2025-07-20 15:37:45 +02:00
Steven WdV
41cc4fb4ac
Merge remote-tracking branch 'stevenwdv/merge-anchor-fix' into merge-anchor-fix
...
# Conflicts:
# pkg/yqlib/doc/operators/anchor-and-alias-operators.md
# pkg/yqlib/operator_anchors_aliases_test.go
2025-07-20 15:00:23 +02:00
Steven WdV
9c95a9f379
Unify reconstructAliasedMap & fixedReconstructAliasedMap
2025-07-20 14:59:17 +02:00
Steven WdV
a4720c089a
Merge remote-tracking branch 'origin/MakeExplodeGreatAgain' into merge-anchor-fix
...
# Conflicts:
# pkg/yqlib/doc/operators/anchor-and-alias-operators.md
# pkg/yqlib/operator_anchors_aliases.go
# pkg/yqlib/operator_anchors_aliases_test.go
2025-07-20 14:37:36 +02:00
Steven WdV
3431aebb2c
Add tests for accessing !!str <<
2025-07-20 13:28:14 +02:00
Steven WdV
ae87394f4a
Formatting
2025-07-20 13:24:48 +02:00
Steven WdV
08ecd39a1e
Add tests for invalid merge key handling for traverse
2025-07-16 18:07:16 +02:00
Steven WdV
b7aa711d94
Add note
2025-07-16 18:02:51 +02:00
Steven WdV
a5b8ef6cb1
Add some tests regarding override behavior.
...
The one in fixedTraversePathOperatorScenarios still fails
2025-07-16 17:56:56 +02:00
Steven WdV
a47e882c8f
Flag for fixed list merge key traverse override behavior,
...
and fix traversing map with merge key that would override local key (completes #2110 fix)
2025-07-16 16:00:16 +02:00
Steven WdV
128bf80eed
Merge branch 'master' into merge-anchor-fix
2025-07-16 14:25:23 +02:00
Steven WdV
8c06478ade
Remove now-unused badAliasSample
2025-07-10 15:03:44 +02:00
Steven WdV
fa6dc5c9fb
Move new merge test comments to description field
2025-07-10 15:03:41 +02:00
Steven WdV
ce9a4af0df
Fix inline map exploding when it contains aliases
2025-06-16 16:09:55 +02:00
Steven WdV
4734be9a4d
Fix excessive exploding for merge anchor
2025-06-16 13:53:28 +02:00
Steven WdV
4d88d51b1b
Fix precedence of merge anchor sequence for traverse (explode was already correct)
2025-06-16 13:36:42 +02:00
Steven WdV
31628e7324
Make merge anchor errors for traversing nonfatal
2025-06-16 13:33:42 +02:00
Steven WdV
bfcb3fc6b7
Fix merge anchor exploding
...
- Allow inline maps instead of just aliases
- Allow aliased sequences
- Disallow other types
- Use tag `!!merge` instead of key `<<`
- Fix insertion index for sequence merge
Closes #2386
2025-06-16 09:58:26 +02:00
Steven WdV
c3782799c5
Merge anchor traversing: add test for aliased sequence, cleanup
2025-06-16 09:56:10 +02:00
Steven WdV
162ea5437c
Fix merge anchor traversing
...
- Allow inline maps instead of just aliases
- Disallow nested sequences
- Disallow other types
Closes #2386
2025-06-13 19:08:36 +02:00
Steven WdV