Skip to content

Commit a6f80f1

Browse files
committed
Use explicit 'and' by default
1 parent 4d64349 commit a6f80f1

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

src/ui/public/kuery/ast/__tests__/ast.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ describe('kuery AST API', function () {
4747
});
4848

4949
it('should return an "and" function for single literals', function () {
50-
const expected = nodeTypes.function.buildNode('and', [nodeTypes.literal.buildNode('foo')]);
50+
const expected = nodeTypes.function.buildNode('and', [nodeTypes.literal.buildNode('foo')], 'implicit');
5151
const actual = fromKueryExpressionNoMeta('foo');
5252
expectDeepEqual(actual, expected);
5353
});
5454

5555
it('should ignore extraneous whitespace at the beginning and end of the query', function () {
56-
const expected = nodeTypes.function.buildNode('and', [nodeTypes.literal.buildNode('foo')]);
56+
const expected = nodeTypes.function.buildNode('and', [nodeTypes.literal.buildNode('foo')], 'implicit');
5757
const actual = fromKueryExpressionNoMeta(' foo ');
5858
expectDeepEqual(actual, expected);
5959
});
@@ -62,7 +62,7 @@ describe('kuery AST API', function () {
6262
const expected = nodeTypes.function.buildNode('and', [
6363
nodeTypes.literal.buildNode('foo'),
6464
nodeTypes.literal.buildNode('bar'),
65-
]);
65+
], 'implicit');
6666
const actual = fromKueryExpressionNoMeta('foo bar');
6767
expectDeepEqual(actual, expected);
6868
});

src/ui/public/kuery/functions/__tests__/and.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ describe('kuery functions', function () {
3333
expect(actualChildNode2).to.be(childNode2);
3434
});
3535

36-
it('serializeStyle should default to "implicit"', function () {
36+
it('serializeStyle should default to "operator"', function () {
3737
const { serializeStyle } = and.buildNodeParams([childNode1, childNode2]);
38-
expect(serializeStyle).to.be('implicit');
38+
expect(serializeStyle).to.be('operator');
3939
});
4040

4141
});
@@ -65,8 +65,8 @@ describe('kuery functions', function () {
6565

6666
describe('toKueryExpression', function () {
6767

68-
it('should serialize "and" nodes with an implicit syntax by default', function () {
69-
const node = nodeTypes.function.buildNode('and', [childNode1, childNode2]);
68+
it('should serialize "and" nodes with an implicit syntax when requested', function () {
69+
const node = nodeTypes.function.buildNode('and', [childNode1, childNode2], 'implicit');
7070
const result = and.toKueryExpression(node);
7171
expect(result).to.be('"response":200 "extension":"jpg"');
7272
});
@@ -80,7 +80,7 @@ describe('kuery functions', function () {
8080
it('should wrap "or" sub-queries in parenthesis', function () {
8181
const orNode = nodeTypes.function.buildNode('or', [childNode1, childNode2], 'operator');
8282
const fooBarNode = nodeTypes.function.buildNode('is', 'foo', 'bar');
83-
const andNode = nodeTypes.function.buildNode('and', [orNode, fooBarNode]);
83+
const andNode = nodeTypes.function.buildNode('and', [orNode, fooBarNode], 'implicit');
8484

8585
const result = and.toKueryExpression(andNode);
8686
expect(result).to.be('("response":200 or "extension":"jpg") "foo":"bar"');

src/ui/public/kuery/functions/and.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as ast from '../ast';
22
import { nodeTypes } from '../node_types';
33

4-
export function buildNodeParams(children, serializeStyle = 'implicit') {
4+
export function buildNodeParams(children, serializeStyle = 'operator') {
55
return {
66
arguments: children,
77
serializeStyle

0 commit comments

Comments
 (0)