Move buildEsQuery to a package

.eslintignore

@@ -8,8 +8,8 @@ bower_components
 /src/fixtures/vislib/mock_data
 /src/ui/public/angular-bootstrap
 /src/ui/public/flot-charts
-/src/ui/public/kuery/ast/kuery.js
-/src/ui/public/kuery/ast/legacy_kuery.js
+/src/utils/kuery/ast/kuery.js
+/src/utils/kuery/ast/legacy_kuery.js
 /test/fixtures/scenarios
 /src/core_plugins/console/public/webpackShims
 /src/core_plugins/console/public/tests/webpackShims

src/core_plugins/input_control_vis/public/control/filter_manager/phrase_filter_manager.js

@@ -19,8 +19,7 @@
 
 import _ from 'lodash';
 import { FilterManager } from './filter_manager.js';
-import { buildPhraseFilter } from 'ui/filter_manager/lib/phrase';
-import { buildPhrasesFilter } from 'ui/filter_manager/lib/phrases';
+import { buildPhraseFilter, buildPhrasesFilter } from '../../../../../utils/filters';
 
 export class PhraseFilterManager extends FilterManager {
   constructor(controlId, fieldName, indexPattern, queryFilter) {

src/core_plugins/input_control_vis/public/control/filter_manager/range_filter_manager.js

@@ -19,7 +19,7 @@
 
 import _ from 'lodash';
 import { FilterManager } from './filter_manager.js';
-import { buildRangeFilter } from 'ui/filter_manager/lib/range';
+import { buildRangeFilter } from '../../../../../utils/filters';
 
 // Convert slider value into ES range filter
 function toRange(sliderValue) {

src/core_plugins/vega/public/vega_view/vega_base_view.js

@@ -25,7 +25,7 @@ import * as vegaLite from 'vega-lite';
 import { Utils } from '../data_model/utils';
 import { VISUALIZATION_COLORS } from '@elastic/eui';
 import { TooltipHandler } from './vega_tooltip';
-import { buildQueryFilter } from 'ui/filter_manager/lib';
+import { buildQueryFilter } from '../../../../utils/filters';
 
 vega.scheme('elastic', VISUALIZATION_COLORS);
 

src/ui/public/agg_types/buckets/_terms_other_bucket_helper.js

@@ -18,8 +18,7 @@
  */
 
 import _ from 'lodash';
-import { buildExistsFilter } from '../../filter_manager/lib/exists';
-import { buildPhrasesFilter } from '../../filter_manager/lib/phrases';
+import { buildExistsFilter, buildPhrasesFilter } from '../../../../utils/filters';
 import { buildQueryFromFilters } from '../../courier';
 
 /**

src/ui/public/agg_types/buckets/create_filter/date_histogram.js

@@ -18,7 +18,7 @@
  */
 
 import moment from 'moment';
-import { buildRangeFilter } from '../../../filter_manager/lib/range';
+import { buildRangeFilter } from '../../../../../utils/filters';
 
 export function createFilterDateHistogram(agg, key) {
   const start = moment(key);

src/ui/public/agg_types/buckets/create_filter/date_range.js

@@ -19,7 +19,7 @@
 
 import chrome from '../../../chrome';
 import { dateRange } from '../../../utils/date_range';
-import { buildRangeFilter } from '../../../filter_manager/lib/range';
+import { buildRangeFilter } from '../../../../../utils/filters';
 
 const config = chrome.getUiSettingsClient();
 

src/ui/public/agg_types/buckets/create_filter/filters.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { buildQueryFilter } from '../../../filter_manager/lib/query';
+import { buildQueryFilter } from '../../../../../utils/filters';
 import _ from 'lodash';
 
 export function createFilterFilters(aggConfig, key) {

src/ui/public/agg_types/buckets/create_filter/histogram.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { buildRangeFilter } from '../../../filter_manager/lib/range';
+import { buildRangeFilter } from '../../../../../utils/filters';
 
 export function createFilterHistogram(aggConfig, key) {
   const value = parseInt(key, 10);

src/ui/public/agg_types/buckets/create_filter/ip_range.js

@@ -18,7 +18,7 @@
  */
 
 import { CidrMask } from '../../../utils/cidr_mask';
-import { buildRangeFilter } from '../../../filter_manager/lib/range';
+import { buildRangeFilter } from '../../../../../utils/filters';
 
 export function createFilterIpRange(aggConfig, key) {
   let range;

src/ui/public/agg_types/buckets/create_filter/range.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { buildRangeFilter } from '../../../filter_manager/lib/range';
+import { buildRangeFilter } from '../../../../../utils/filters';
 
 export function createFilterRange(aggConfig, key) {
   return buildRangeFilter(

src/ui/public/agg_types/buckets/create_filter/terms.js

@@ -17,9 +17,7 @@
  * under the License.
  */
 
-import { buildPhraseFilter } from '../../../filter_manager/lib/phrase';
-import { buildPhrasesFilter } from '../../../filter_manager/lib/phrases';
-import { buildExistsFilter } from '../../../filter_manager/lib/exists';
+import { buildPhraseFilter, buildPhrasesFilter, buildExistsFilter } from '../../../../../utils/filters';
 
 export function createFilterTerms(aggConfig, key, params) {
   const field = aggConfig.params.field;

src/ui/public/courier/search_source/index.js

@@ -18,6 +18,3 @@
  */
 
 export { SearchSourceProvider } from './search_source';
-export { migrateFilter } from './migrate_filter';
-export { decorateQuery } from './decorate_query';
-export { buildQueryFromFilters, luceneStringToDsl } from './build_query';

src/ui/public/courier/search_source/search_source.js

@@ -82,7 +82,8 @@ import { searchRequestQueue } from '../search_request_queue';
 import { FetchSoonProvider } from '../fetch';
 import { FieldWildcardProvider } from '../../field_wildcard';
 import { getHighlightRequest } from '../../../../core_plugins/kibana/common/highlight';
-import { BuildESQueryProvider } from './build_query';
+import { BuildESQueryProvider } from '../../../../utils/es_query';
+import { KbnError } from '../../errors';
 
 const FIELDS = [
   'type',
@@ -601,7 +602,11 @@ export function SearchSourceProvider(Promise, Private, config) {
             _.set(flatData.body, '_source.includes', remainingFields);
           }
 
-          flatData.body.query = buildESQuery(flatData.index, flatData.query, flatData.filters);
+          try {
+            flatData.body.query = buildESQuery(flatData.index, flatData.query, flatData.filters);
+          } catch (e) {
+            throw new KbnError(e.message, KbnError);
+          }
 
           if (flatData.highlightAll != null) {
             if (flatData.highlightAll && flatData.body.query) {

src/ui/public/filter_editor/filter_editor.js

@@ -38,7 +38,7 @@ import {
   areIndexPatternsProvided,
   isFilterPinned
 } from './lib/filter_editor_utils';
-import * as filterBuilder from '../filter_manager/lib';
+import * as filterBuilder from '../../../utils/filters';
 import { keyMap } from '../utils/key_map';
 
 const module = uiModules.get('kibana');

src/ui/public/filter_manager/filter_manager.js

@@ -19,7 +19,7 @@
 
 import _ from 'lodash';
 import { FilterBarQueryFilterProvider } from '../filter_bar/query_filter';
-import { getPhraseScript } from './lib/phrase';
+import { getPhraseScript } from '../../../utils/filters';
 
 // Adds a filter to a passed state
 export function FilterManagerProvider(Private) {

src/ui/public/kuery/index.js

@@ -17,6 +17,4 @@
  * under the License.
  */
 
-export * from './ast';
-export * from './filter_migration';
-export * from './node_types';
+export * from '../../../utils/kuery';

src/ui/public/utils/brush_event.js

@@ -19,7 +19,7 @@
 
 import _ from 'lodash';
 import moment from 'moment';
-import { buildRangeFilter } from '../filter_manager/lib/range';
+import { buildRangeFilter } from '../../../utils/filters';
 import { timefilter } from 'ui/timefilter';
 
 export function onBrushEvent(event, $state) {

src/ui/public/courier/search_source/build_query/__tests__/build_es_query.js → src/utils/es_query/__tests__/build_es_query.js

@@ -21,7 +21,7 @@ import { BuildESQueryProvider } from '../build_es_query';
 import StubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 import ngMock from 'ng_mock';
 import { expectDeepEqual } from '../../../../../../test_utils/expect_deep_equal.js';
-import { fromKueryExpression, toElasticsearchQuery } from '../../../../kuery';
+import { fromKueryExpression, toElasticsearchQuery } from '../../../../../../utils/kuery';
 import { luceneStringToDsl } from '../lucene_string_to_dsl';
 import { decorateQuery } from '../../decorate_query';
 

src/ui/public/courier/search_source/build_query/__tests__/from_kuery.js → src/utils/es_query/__tests__/from_kuery.js

@@ -22,7 +22,7 @@ import StubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index
 import ngMock from 'ng_mock';
 import { expectDeepEqual } from '../../../../../../test_utils/expect_deep_equal.js';
 import expect from 'expect.js';
-import { fromKueryExpression, toElasticsearchQuery } from '../../../../kuery';
+import { fromKueryExpression, toElasticsearchQuery } from '../../../../../../utils/kuery';
 
 let indexPattern;
 

src/ui/public/courier/search_source/build_query/build_es_query.js → src/utils/es_query/build_es_query.js

@@ -18,7 +18,6 @@
  */
 
 import { groupBy, has } from 'lodash';
-import { decorateQuery } from '../decorate_query';
 import { buildQueryFromKuery } from './from_kuery';
 import { buildQueryFromFilters } from './from_filters';
 import { buildQueryFromLucene } from './from_lucene';
@@ -35,7 +34,7 @@ export function BuildESQueryProvider(config) {
     const queriesByLanguage = groupBy(validQueries, 'language');
 
     const kueryQuery = buildQueryFromKuery(indexPattern, queriesByLanguage.kuery, config);
-    const luceneQuery = buildQueryFromLucene(queriesByLanguage.lucene, decorateQuery);
+    const luceneQuery = buildQueryFromLucene(queriesByLanguage.lucene, config);
     const filterQuery = buildQueryFromFilters(filters, indexPattern);
 
     return {

src/ui/public/courier/search_source/decorate_query.js → src/utils/es_query/decorate_query.js

@@ -18,16 +18,13 @@
  */
 
 import _ from 'lodash';
-import chrome from '../../chrome';
-
-const config = chrome.getUiSettingsClient();
 
 /**
  * Decorate queries with default parameters
  * @param {query} query object
  * @returns {object}
  */
-export function decorateQuery(query) {
+export function decorateQuery(query, config) {
   const queryOptions = config.get('query:queryString:options');
 
   if (_.has(query, 'query_string.query')) {

src/ui/public/courier/search_source/build_query/from_filters.js → src/utils/es_query/from_filters.js

@@ -18,7 +18,7 @@
  */
 
 import _ from 'lodash';
-import { migrateFilter } from '../migrate_filter';
+import { migrateFilter } from './migrate_filter';
 
 /**
  * Create a filter that can be reversed for filters with negate set

src/ui/public/courier/search_source/build_query/from_kuery.js → src/utils/es_query/from_kuery.js

@@ -17,35 +17,11 @@
  * under the License.
  */
 
-import { fromLegacyKueryExpression, fromKueryExpression, toElasticsearchQuery, nodeTypes } from '../../../kuery';
-import { documentationLinks } from '../../../documentation_links';
-import { NoLeadingWildcardsError } from '../../../kuery/errors';
-
-const queryDocs = documentationLinks.query;
+import { fromKueryExpression, toElasticsearchQuery, nodeTypes } from '../kuery';
 
 export function buildQueryFromKuery(indexPattern, queries = [], config) {
   const allowLeadingWildcards = config.get('query:allowLeadingWildcards');
-
-  const queryASTs = queries.map((query) => {
-    try {
-      return fromKueryExpression(query.query, { allowLeadingWildcards });
-    }
-    catch (parseError) {
-      if (parseError instanceof NoLeadingWildcardsError) {
-        throw parseError;
-      }
-
-      try {
-        fromLegacyKueryExpression(query.query);
-      }
-      catch (legacyParseError) {
-        throw parseError;
-      }
-      throw new Error(
-        `It looks like you're using an outdated Kuery syntax. See what changed in the [docs](${queryDocs.kueryQuerySyntax})!`
-      );
-    }
-  });
+  const queryASTs = queries.map(query => fromKueryExpression(query.query, { allowLeadingWildcards }));
   return buildQuery(indexPattern, queryASTs);
 }
 

src/ui/public/courier/search_source/build_query/from_lucene.js → src/utils/es_query/from_lucene.js

@@ -18,12 +18,13 @@
  */
 
 import _ from 'lodash';
+import { decorateQuery } from './decorate_query';
 import { luceneStringToDsl } from './lucene_string_to_dsl';
 
-export function buildQueryFromLucene(queries, decorateQuery) {
+export function buildQueryFromLucene(queries, config) {
   const combinedQueries = _.map(queries, (query) => {
     const queryDsl = luceneStringToDsl(query.query);
-    return decorateQuery(queryDsl);
+    return decorateQuery(queryDsl, config);
   });
 
   return {

src/ui/public/courier/search_source/migrate_filter.js → src/utils/es_query/migrate_filter.js

@@ -18,7 +18,7 @@
  */
 
 import _ from 'lodash';
-import { getConvertedValueForField } from '../../filter_manager/lib/phrase';
+import { getConvertedValueForField } from '../../utils/filters';
 
 export function migrateFilter(filter, indexPattern) {
   if (filter.match) {

src/ui/public/filter_manager/lib/index.js → src/utils/filters/index.js

@@ -17,8 +17,8 @@
  * under the License.
  */
 
-export { buildExistsFilter } from './exists';
-export { buildPhraseFilter } from './phrase';
-export { buildPhrasesFilter } from './phrases';
-export { buildQueryFilter } from './query';
-export { buildRangeFilter } from './range';
+export * from './exists';
+export * from './phrase';
+export * from './phrases';
+export * from './query';
+export * from './range';

src/ui/public/kuery/ast/ast.js → src/utils/kuery/ast/ast.js

@@ -19,7 +19,6 @@
 
 import _ from 'lodash';
 import { nodeTypes } from '../node_types/index';
-import * as errors from '../errors';
 import { parse as parseKuery } from './kuery';
 import { parse as parseLegacyKuery } from './legacy_kuery';
 
@@ -47,7 +46,7 @@ function fromExpression(expression, parseOptions = {}, parse = parseKuery) {
 
   parseOptions = {
     ...parseOptions,
-    helpers: { nodeTypes, errors }
+    helpers: { nodeTypes }
   };
 
   return parse(expression, parseOptions);

src/ui/public/kuery/ast/kuery.peg → src/utils/kuery/ast/kuery.peg

@@ -5,7 +5,7 @@
 
 // Initialization block
 {
-  const { parseCursor, cursorSymbol, allowLeadingWildcards = true, helpers: { nodeTypes, errors } } = options;
+  const { parseCursor, cursorSymbol, allowLeadingWildcards = true, helpers: { nodeTypes } } = options;
   const buildFunctionNode = nodeTypes.function.buildNodeWithArgumentNodes;
   const buildLiteralNode = nodeTypes.literal.buildNode;
   const buildWildcardNode = nodeTypes.wildcard.buildNode;
@@ -163,7 +163,7 @@ Value
     if (value.type === 'cursor') return value;
 
     if (!allowLeadingWildcards && value.type === 'wildcard' && nodeTypes.wildcard.hasLeadingWildcard(value)) {
-      throw new errors.NoLeadingWildcardsError();
+      error('Leading wildcards are disabled. See query:allowLeadingWildcards in Advanced Settings.');
     }
 
     const isPhrase = buildLiteralNode(false);

src/ui/public/kuery/functions/is.js → src/utils/kuery/functions/is.js

@@ -21,7 +21,7 @@ import _ from 'lodash';
 import * as ast from '../ast';
 import * as literal from '../node_types/literal';
 import * as wildcard from '../node_types/wildcard';
-import { getPhraseScript } from '../../filter_manager/lib/phrase';
+import { getPhraseScript } from '../../filters';
 import { getFields } from './utils/get_fields';
 
 export function buildNodeParams(fieldName, value, isPhrase = false) {

src/ui/public/kuery/functions/range.js → src/utils/kuery/functions/range.js

@@ -20,7 +20,7 @@
 import _ from 'lodash';
 import { nodeTypes } from '../node_types';
 import * as ast from '../ast';
-import { getRangeScript } from '../../filter_manager/lib/range';
+import { getRangeScript } from '../../filters';
 import { getFields } from './utils/get_fields';
 
 export function buildNodeParams(fieldName, params) {