-
Notifications
You must be signed in to change notification settings - Fork 77
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
base: master
Are you sure you want to change the base?
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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. | ||
* | ||
|
@@ -303,6 +309,42 @@ class QueryStringQuery extends QueryStringQueryBase { | |
this._queryOpts.escape = enable; | ||
return this; | ||
} | ||
|
||
/** | ||
* Sets the type of query string query. 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` - 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) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 There was a problem hiding this comment. Choose a reason for hiding this commentThe 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? There was a problem hiding this comment. Choose a reason for hiding this commentThe 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.
Yes, we could re-use There was a problem hiding this comment. Choose a reason for hiding this commentThe 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. There was a problem hiding this comment. Choose a reason for hiding this commentThe 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; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this type was not available in Elasticsearch v6 - https://www.elastic.co/guide/en/elasticsearch/reference/6.8/query-dsl-multi-match-query.html#multi-match-types
Could we add a note regarding the same? If you can identify the exact version that it was added in, that would be great.