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

feat: Add type option to queryStringQuery #153

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ This is the last step! Make sure your PR is aimed to merge with the `master`
branch.

You should also write a good PR message with information on why this feature or
fix is necesary or a good idea. For features, be sure to include information on
fix is necessary or a good idea. For features, be sure to include information on
how to use the feature; and for bugs, information on how to reproduce the bug is
helpful!

Expand Down
9 changes: 9 additions & 0 deletions src/core/consts.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,15 @@ exports.GEO_RELATION_SET = new Set([
'INTERSECTS'
]);

exports.QUERY_STRING_TYPE = new Set([
'best_fields',
'most_fields',
'cross_fields',
'phrase',
'phrase_prefix',
'bool_prefix'
]);

exports.SUGGEST_MODE_SET = new Set(['missing', 'popular', 'always']);

exports.STRING_DISTANCE_SET = new Set([
Expand Down
44 changes: 43 additions & 1 deletion src/queries/full-text-queries/query-string-query.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,16 @@

const QueryStringQueryBase = require('./query-string-query-base');
const { validateRewiteMethod } = require('../helper');

const isNil = require('lodash.isnil');
const {
util: { invalidParam },
consts: { QUERY_STRING_TYPE }
} = require('../../core');
const ES_REF_URL =
'https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html';

const invalidTypeParam = invalidParam(ES_REF_URL, 'type', QUERY_STRING_TYPE);

/**
* A query that uses a query parser in order to parse its content.
*
Expand Down Expand Up @@ -303,6 +309,42 @@ class QueryStringQuery extends QueryStringQueryBase {
this._queryOpts.escape = enable;
return this;
}

/**
* Sets the type of query string query (Added in v6.0). Valid values are:
* - `best_fields` - (default) Finds documents which match any field,
* but uses the `_score` from the best field.
*
* - `most_fields` - Finds documents which match any field and combines
* the `_score` from each field.
*
* - `cross_fields` - Treats fields with the same `analyzer` as though
* they were one big field. Looks for each word in *any* field
*
* - `phrase` - Runs a `match_phrase` query on each field and combines
* the `_score` from each field.
*
* - `phrase_prefix` - Runs a `match_phrase_prefix` query on each field
* and combines the `_score` from each field.
*
* - `bool_prefix` - (added in v7.2) Creates a match_bool_prefix query on each field and
* combines the _score from each field.
*
*
* @param {string} type Can be one of `best_fields`, `most_fields`,
* `cross_fields`, `phrase`, `phrase_prefix` and `bool_prefix`. Default is
* `best_fields`.
* @returns {QueryStringQuery} returns `this` so that calls can be chained.
*/
type(type) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please update the type definition as well - https://github.com/sudo-suhas/elastic-builder/blob/v2.16.0/src/index.d.ts#L996-L1078

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we just have an enum for these type values? They are duplicated in the multi match query. Also in the .js files these values are duplicated. How do you want to handle this?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you clarify what you mean by an enum? The source is not using Typescript yet.

They are duplicated in the multi-match query.

Yes, we could re-use MULTI_MATCH_TYPE defined in the src/core/consts.js file.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've been a bit busy but will get to this soon. I have also found 1 more area that I want to improve and will just include it with this PR since as well.

I'll get some changes pushed up next week to get this (hopefully) approved and released.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I can see, this option was added only in Elasticsearch v6 based on the docs for v5. Can we add a note calling out the same?

if (isNil(type)) invalidTypeParam(type);

const typeLower = type.toLowerCase();
if (!QUERY_STRING_TYPE.has(typeLower)) invalidTypeParam(type);

this._queryOpts.type = typeLower;
return this;
}
}

module.exports = QueryStringQuery;
11 changes: 10 additions & 1 deletion test/queries-test/query-string-query.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,15 @@ const validRewrites = [
'top_terms_boost_23',
'top_terms_15'
];

const validType = [
'best_fields',
'most_fields',
'cross_fields',
'phrase',
'phrase_prefix',
'bool_prefix'
];
test(validatedCorrectly, getInstance, 'type', validType, false);
test(validatedCorrectly, getInstance, 'rewrite', validRewrites, false);
test(validatedCorrectly, getInstance, 'fuzzyRewrite', validRewrites, false);
test(setsOption, 'defaultField', { param: 'my_field' });
Expand All @@ -41,3 +49,4 @@ test(setsOption, 'useDisMax', { param: true });
test(setsOption, 'tieBreaker', { param: 0.3 });
test(setsOption, 'quoteAnalyzer', { param: 'my_analyzer' });
test(setsOption, 'escape', { param: true });
test(setsOption, 'type', { param: 'best_fields' });