diff --git a/pkg/yqlib/doc/Multiply.md b/pkg/yqlib/doc/Multiply.md index cd872c86..6d8b14dc 100644 --- a/pkg/yqlib/doc/Multiply.md +++ b/pkg/yqlib/doc/Multiply.md @@ -1,13 +1,14 @@ -Like the multiple operator in `jq`, depending on the operands, this multiply operator will do different things. Currently only objects are supported, which have the effect of merging the RHS into the LHS. +Like the multiple operator in jq, depending on the operands, this multiply operator will do different things. Currently only objects are supported, which have the effect of merging the RHS into the LHS. -Upcoming versions of `yq` will add support for other types of multiplication (numbers, strings). - -To concatenate when merging objects, use the `*+` form (see examples below). This will recursively merge objects, appending arrays when it encounters them. +To concatenate arrays when merging objects, use the *+ form (see examples below). This will recursively merge objects, appending arrays when it encounters them. +To merge only existing fields, use the *? form. Note that this can be used with the concatenate arrays too *+?. Note that when merging objects, this operator returns the merged object (not the parent). This will be clearer in the examples below. +Multiplication of strings and numbers are not yet supported. + ## Merging files -Note the use of eval-all to ensure all documents are loaded into memory. +Note the use of `eval-all` to ensure all documents are loaded into memory. ```bash yq eval-all 'select(fileIndex == 0) * select(fileIndex == 1)' file1.yaml file2.yaml diff --git a/pkg/yqlib/doc/headers/Multiply.md b/pkg/yqlib/doc/headers/Multiply.md index 81cf758b..24c5c557 100644 --- a/pkg/yqlib/doc/headers/Multiply.md +++ b/pkg/yqlib/doc/headers/Multiply.md @@ -1,13 +1,14 @@ -Like the multiple operator in `jq`, depending on the operands, this multiply operator will do different things. Currently only objects are supported, which have the effect of merging the RHS into the LHS. +Like the multiple operator in jq, depending on the operands, this multiply operator will do different things. Currently only objects are supported, which have the effect of merging the RHS into the LHS. -Upcoming versions of `yq` will add support for other types of multiplication (numbers, strings). - -To concatenate when merging objects, use the `*+` form (see examples below). This will recursively merge objects, appending arrays when it encounters them. +To concatenate arrays when merging objects, use the *+ form (see examples below). This will recursively merge objects, appending arrays when it encounters them. +To merge only existing fields, use the *? form. Note that this can be used with the concatenate arrays too *+?. Note that when merging objects, this operator returns the merged object (not the parent). This will be clearer in the examples below. +Multiplication of strings and numbers are not yet supported. + ## Merging files -Note the use of eval-all to ensure all documents are loaded into memory. +Note the use of `eval-all` to ensure all documents are loaded into memory. ```bash yq eval-all 'select(fileIndex == 0) * select(fileIndex == 1)' file1.yaml file2.yaml