Commit Graph

259 Commits

Author SHA1 Message Date
Mike Farah a6d4dbb8b8 equal! 2020-10-09 15:05:45 +11:00
Mike Farah c7ebdda530 added AND op 2020-10-09 12:10:46 +11:00
Mike Farah a0d940638c use orderermap 2020-10-09 12:04:19 +11:00
Mike Farah c09513803a wip 2020-10-09 11:37:47 +11:00
Mike Farah f95226e267 ops work in theory! 2020-10-09 11:10:37 +11:00
Mike Farah f479a7e8e3 wip 2020-10-09 10:59:03 +11:00
Mike Farah f7d4695837 binary tree ftw 2020-10-09 08:51:14 +11:00
Mike Farah 5ee52f9506 wip 2020-10-09 08:51:14 +11:00
Mike Farah c2159d9861 postfix with traverse op 2020-10-09 08:51:14 +11:00
Mike Farah 95bc1e1599 include traverse as a operator token 2020-10-09 08:51:14 +11:00
Mike Farah e32bc43c4e postfix wip! 2020-10-09 08:51:14 +11:00
Mike Farah a8bdc12d83 to postfix wip 2020-10-09 08:51:14 +11:00
Mike Farah ae59ad57f4 tree wip 2020-10-09 08:51:14 +11:00
Mike Farah c321600afa fixed wrapping! 2020-10-09 08:51:14 +11:00
Mike Farah 4c95efa469 wip 2020-10-09 08:51:14 +11:00
Morgan Bazalgette bb9cb0c60e fix tests 2020-10-09 08:38:42 +11:00
Morgan Bazalgette a125495eec keep order of keys when json marshalling 2020-10-09 08:38:42 +11:00
Mike Farah a8cfccd3af Merge master fix 2020-09-13 10:59:40 +10:00
Mike Farah 3355e80d85 Merge branch 'master' into new-merge2 2020-09-13 10:52:31 +10:00
Mike Farah f528b28938 Convert to JSON now handles non string keys 2020-09-13 10:44:22 +10:00
Mike Farah 9f43a4a265 Keep comments when using the write commandt o update values 2020-09-08 09:46:04 +10:00
Mike Farah fea8510061 Added comments merge strategy 2020-07-17 15:51:03 +10:00
Mike Farah d66a709213 refactored array merge flags into a strategy 2020-07-17 13:26:20 +10:00
Mike Farah 2fc39b3865 Can overwrite arrays when merging 2020-07-17 13:07:32 +10:00
Mike Farah b11661a1be Refactored merge - will allow more sophisticated mergin 2020-06-18 09:44:36 +10:00
Mike Farah eac218980e Visit document node 2020-06-18 09:03:40 +10:00
Mike Farah 80e7f46538 Dont log mergePathStackToString - end up with duplicate logs 2020-06-18 09:03:40 +10:00
Mike Farah 89cbe63343 Fixed deep read at root level 2020-06-15 12:31:13 +10:00
Mike Farah 1405584892 New,Update now support anchors and aliases 2020-06-11 13:57:13 +10:00
Mike Farah e90b00957b Added missing flow style 2020-06-11 09:58:10 +10:00
Mike Farah 71f5f76213 Delete now works with deep splat 2020-06-11 09:53:36 +10:00
Mike Farah 23de61a8d7 Can now update tag/style of nodes without affecting the value 2020-04-17 17:09:33 +10:00
Mike Farah 64135a16e1 Use single/double instead of singleQuoted/doubleQuoted 2020-04-17 11:24:45 +10:00
Mike Farah 06d8715cbe Added customStyle flag, split command tests 2020-04-17 11:03:43 +10:00
Mike Farah 8f166a9848 Fixed negative index bug 2020-04-14 11:17:29 +10:00
Mike Farah 1f9a3f5f6c Added negative index capability 2020-04-13 10:36:46 +10:00
Mike Farah 67fb924e0e Can find array elements bu value 2020-02-28 15:24:16 +11:00
Mike Farah b64187fe32 Dont recurse into scalar nodes
Fixes https://github.com/mikefarah/yq/issues/375
2020-02-28 15:03:56 +11:00
Mike Farah f91093d5fe Colors work for all commands 2020-02-28 10:42:19 +11:00
Mike Farah a46386e093 Fixed special characters in path for merging 2020-02-18 20:18:49 +11:00
Mike Farah 9864afc4e7 Fixed empty merge problem 2020-02-18 09:15:46 +11:00
Mike Farah 83c13ce392 Fixed empty merge problem - need to visit empty arrays and objects 2020-02-13 14:56:58 +11:00
Mike Farah 24e906bae6 Fixed numeric map key issue 2020-02-12 15:40:21 +11:00
Mike Farah 9de2573009 Fixed merge append arrays 2020-02-07 16:32:39 +11:00
Mike Farah 29521f2e3e Simplified when to visit a node 2020-02-07 14:52:37 +11:00
Mike Farah 72cd3e4a2a Fixed explode for aliases to scalars 2020-02-07 10:42:07 +11:00
Mike Farah d40ad9649d Fixed explode for aliases to scalars 2020-02-07 10:09:20 +11:00
Mike Farah 63313ebb02 Merge branch 'coryrc-fix-merge-with-dots' into compare 2020-02-07 09:10:25 +11:00
Mike Farah de3bfaef60 Merge branch 'fix-merge-with-dots' of git://github.com/coryrc/yq into coryrc-fix-merge-with-dots 2020-02-07 09:09:52 +11:00
Mike Farah 108b5cb093 Fixed explode for simple anchors 2020-02-07 09:08:52 +11:00
Cory Cross ea9df0eede Fix path generation when merging file has period in key
The program generates a path for every leaf node in the
file-to-be-merged. It does not escape them if they contain a dot, as
the path-expressions document mentions is necessary.

Add in a test for this condition. Verified it fails without the fix.
2020-02-04 22:37:00 -08:00
Mike Farah 02258fbaae Fixed deep splatting merge anchors - dont visit twice 2020-02-04 14:10:12 +11:00
Mike Farah 6f0538173b Fix delete adding entries 2020-02-04 09:58:20 +11:00
Mike Farah 6840ea8c78 can set indent levels 2020-02-03 16:56:01 +11:00
Mike Farah 166f866f28 Pretty print json 2020-02-03 16:31:03 +11:00
Mike Farah 4dbe3636c2 Splat array is now the fallback instead of parsing int 2020-01-30 15:11:47 +11:00
Mike Farah 4a5bd0ff5b No need to log error 2020-01-30 15:00:27 +11:00
Mike Farah 44f36833cf Fixed delete array pattern matching 2020-01-30 14:55:58 +11:00
Mike Farah 1a4d8158ba Removed custom value parsing logic 2020-01-20 08:42:08 +11:00
Mike Farah 350a8343e9 adv search with prefix! 2020-01-11 19:52:33 +11:00
Mike Farah 35fd5b7ae4 Extracted out is path expression checking logic 2020-01-11 19:30:27 +11:00
Mike Farah 74c7a4e027 it works! wip 2020-01-11 18:52:15 +11:00
Mike Farah 854f5f0fc9 wip json encoding 2020-01-10 22:01:59 +11:00
Mike Farah feba7b04fa Added path stack to string test 2020-01-09 21:36:05 +11:00
Mike Farah 0621307391 Fixed linting errors 2020-01-09 21:27:52 +11:00
Mike Farah 924eb6c462 Added missing functions to interface 2020-01-09 21:18:24 +11:00
Mike Farah 52eef67e37 more tests, some refactoring 2020-01-09 08:17:56 +11:00
Mike Farah e3f4eedd51 Fixed merge new array 2020-01-06 10:12:38 +13:00
Mike Farah 690da9ee74 Fixed merge new array 2020-01-06 10:12:30 +13:00
Mike Farah 1f7f1b0def Merge arrays! 2020-01-05 17:28:24 +13:00
Mike Farah 1aa5ec1d40 Merge! wip 2020-01-05 17:14:14 +13:00
Mike Farah 625cfdac75 wip; 2019-12-31 15:21:39 +13:00
Mike Farah 4dbdd4a805 Deep splat! 2019-12-30 16:51:07 +13:00
Mike Farah 8a6af1720d Fixed modify array issue! 2019-12-30 11:21:21 +13:00
Mike Farah 0652f67a91 Refactored! 2019-12-28 20:19:37 +13:00
Mike Farah df52383ffb Delete works! needs refactor 2019-12-28 10:51:54 +13:00
Mike Farah 707ad09ba5 Refactor wip 2019-12-27 19:06:58 +11:00
Mike Farah cf389bed4a Refactor wip 2019-12-27 19:06:08 +11:00
Mike Farah ff5b23251b Refactor wip 2019-12-25 12:11:04 +11:00
Mike Farah 93dbe80a77 wip 2019-12-24 10:35:57 +11:00
Mike Farah 1e541cd65f wip handle aliases when printing keys 2019-12-23 09:25:44 +11:00
Mike Farah 5204a13685 Show paths 2019-12-23 09:08:00 +11:00
Mike Farah 4fb44dbc47 Return path, smart print 2019-12-22 17:13:11 +11:00
Mike Farah 784513dd18 Merge anchors - refactored 2019-12-22 15:35:16 +11:00
Mike Farah 865a55645c Merge anchors - refactored 2019-12-22 15:33:54 +11:00
Mike Farah 949bf1c1d7 Merge anchors - wip 2019-12-22 15:15:15 +11:00
Mike Farah 19fe718cfb Aliases! 2019-12-16 21:09:23 +11:00
Mike Farah 290579ac7f Handle simple aliases 2019-12-16 20:38:55 +11:00
Mike Farah d7392f7b58 Refactoring 2019-12-16 16:46:20 +11:00
Mike Farah a3cebec2fd Added prefix command 2019-12-16 16:17:01 +11:00
Mike Farah b81fd638d7 wip - new node 2019-12-15 19:34:05 +11:00
Mike Farah 2344638da4 Fixed delete splat 2019-12-15 18:53:49 +11:00
Mike Farah 8be006fba4 Fixed delete splat 2019-12-15 18:52:37 +11:00
Mike Farah 53a4a47ce3 wip - prefix splat 2019-12-15 18:38:40 +11:00
Mike Farah 5988d0cffa Simplified 2019-12-15 18:24:23 +11:00
Mike Farah b7640946ac Delete! 2019-12-15 17:31:26 +11:00
Mike Farah d061b2f9f9 Can delete arrays 2019-12-12 20:47:22 +11:00
Mike Farah 8c0046a622 Refactoring 2019-12-09 13:57:38 +11:00
Mike Farah 586ffb833b Refactoring 2019-12-09 13:57:10 +11:00
Mike Farah 9771e7001c splatting 2019-12-09 13:44:53 +11:00
Mike Farah 8da9a81702 visitor! 2019-12-08 15:59:24 +11:00
Mike Farah d97f1d8be2 recurse 2019-12-08 15:37:30 +11:00
Mike Farah 972e2b9575 wip 2019-12-06 16:36:42 +11:00
Mike Farah aad15ccc6e better v3 2019-12-06 15:57:46 +11:00
Conor Nosal 5fc13bdccd update imports for v2 module path 2019-12-06 13:58:56 +11:00
Conor Nosal 95fec2984e Move parseValue to yqlib/value_parser.go 2019-12-06 13:58:56 +11:00
Conor Nosal 64d1e58f97 test coverage and linting 2019-12-06 13:58:56 +11:00
Conor Nosal 4b3fbb878f Split marshal package from yqlib, implement interfaces 2019-12-06 13:58:56 +11:00
Conor Nosal 26a09e6ec0 Move implementation files to yqlib and test packages to allow for imports:
- Move data_navigator, json_converter, merge, and path_parser to pkg/yqlib
- Extract yamlToString from yq to pkg/yqlib/yaml_converter
- Move utils_test to test/utils
2019-12-06 13:58:56 +11:00