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/agg_types/buckets/filters.js

@@ -25,6 +25,8 @@ import { createFilterFilters } from './create_filter/filters';
 import { decorateQuery, luceneStringToDsl } from '../../courier';
 import filtersTemplate from '../controls/filters.html';
 
+import chrome from 'ui/chrome';
+
 export const filtersBucketAgg = new BucketAggType({
   name: 'filters',
   title: 'Filters',
@@ -53,7 +55,7 @@ export const filtersBucketAgg = new BucketAggType({
             return;
           }
 
-          decorateQuery(query);
+          decorateQuery(query, chrome.getUiSettingsClient());
 
           const matchAllLabel = (filter.input.query === '' && _.has(query, 'match_all')) ? '*' : '';
           const label = filter.label || matchAllLabel || _.get(query, 'query_string.query') || angular.toJson(query);

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

@@ -18,6 +18,9 @@
  */
 
 export { SearchSourceProvider } from './search_source';
-export { migrateFilter } from './migrate_filter';
-export { decorateQuery } from './decorate_query';
-export { buildQueryFromFilters, luceneStringToDsl } from './build_query';
+export {
+  migrateFilter,
+  decorateQuery,
+  buildQueryFromFilters,
+  luceneStringToDsl
+} from '../../../../utils/es_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/__tests__/filter_manager.js

@@ -24,7 +24,7 @@ import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import { FilterManagerProvider } from '..';
 import { FilterBarQueryFilterProvider } from '../../filter_bar/query_filter';
-import { getPhraseScript } from '../lib/phrase';
+import { getPhraseScript } from '../../../../utils/filters';
 let queryFilter;
 let filterManager;
 let appState;

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/kuery/__tests__/index_pattern_response.json → src/utils/__tests__/index_pattern_response.json

@@ -1,4 +1,5 @@
 {
+  "id": "logstash-*",
   "title": "logstash-*",
   "fields": [
     {

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

@@ -18,25 +18,22 @@
  */
 
 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 indexPattern from '../../__tests__/index_pattern_response.json';
+import { expectDeepEqual } from '../../../test_utils/expect_deep_equal';
+import { fromKueryExpression, toElasticsearchQuery } from '../../../utils/kuery';
 import { luceneStringToDsl } from '../lucene_string_to_dsl';
-import { decorateQuery } from '../../decorate_query';
+import { decorateQuery } from '../decorate_query';
 
-let indexPattern;
 let buildEsQuery;
 
-describe('build query', function () {
+const configStub = { get: () => ({}) };
+const privateStub = fn => fn(configStub);
 
+describe('build query', function () {
   describe('buildESQuery', function () {
-
-    beforeEach(ngMock.module('kibana'));
-    beforeEach(ngMock.inject(function (Private) {
-      indexPattern = Private(StubbedLogstashIndexPatternProvider);
-      buildEsQuery = Private(BuildESQueryProvider);
-    }));
+    beforeEach(() => {
+      buildEsQuery = privateStub(BuildESQueryProvider);
+    });
 
     it('should return the parameters of an Elasticsearch bool query', function () {
       const result = buildEsQuery();
@@ -66,7 +63,7 @@ describe('build query', function () {
       const expectedResult = {
         bool: {
           must: [
-            decorateQuery(luceneStringToDsl('bar:baz')),
+            decorateQuery(luceneStringToDsl('bar:baz'), configStub),
             { match_all: {} },
           ],
           filter: [

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

@@ -18,19 +18,19 @@
  */
 
 import expect from 'expect.js';
-import chrome from '../../../chrome';
 import { decorateQuery } from '../decorate_query';
 
-const config = chrome.getUiSettingsClient();
-describe('Query decorator', function () {
+const configStub = {
+  get: () => ({ analyze_wildcard: true })
+};
 
+describe('Query decorator', function () {
   it('should be a function', function () {
     expect(decorateQuery).to.be.a(Function);
   });
 
   it('should merge in the query string options', function () {
-    config.set('query:queryString:options', { analyze_wildcard: true });
-    const decoratedQuery = decorateQuery({ query_string: { query: '*' } });
+    const decoratedQuery = decorateQuery({ query_string: { query: '*' } }, configStub);
     expect(decoratedQuery).to.eql({ query_string: { query: '*', analyze_wildcard: true } });
   });
 });

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

@@ -18,13 +18,10 @@
  */
 
 import { buildQueryFromFilters } from '../from_filters';
-import ngMock from 'ng_mock';
-import { expectDeepEqual } from '../../../../../../test_utils/expect_deep_equal.js';
+import { expectDeepEqual } from '../../../test_utils/expect_deep_equal';
 
 describe('build query', function () {
   describe('buildQueryFromFilters', function () {
-    beforeEach(ngMock.module('kibana'));
-
     it('should return the parameters of an Elasticsearch bool query', function () {
       const result = buildQueryFromFilters([]);
       const expected = {

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

@@ -18,24 +18,15 @@
  */
 
 import { buildQueryFromKuery } from '../from_kuery';
-import StubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
-import ngMock from 'ng_mock';
-import { expectDeepEqual } from '../../../../../../test_utils/expect_deep_equal.js';
+import indexPattern from '../../__tests__/index_pattern_response.json';
+import { expectDeepEqual } from '../../../test_utils/expect_deep_equal';
 import expect from 'expect.js';
-import { fromKueryExpression, toElasticsearchQuery } from '../../../../kuery';
-
-let indexPattern;
+import { fromKueryExpression, toElasticsearchQuery } from '../../../utils/kuery';
 
 describe('build query', function () {
   const configStub = { get: () => true };
 
   describe('buildQueryFromKuery', function () {
-
-    beforeEach(ngMock.module('kibana'));
-    beforeEach(ngMock.inject(function (Private) {
-      indexPattern = Private(StubbedLogstashIndexPatternProvider);
-    }));
-
     it('should return the parameters of an Elasticsearch bool query', function () {
       const result = buildQueryFromKuery(null, [], configStub);
       const expected = {

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

@@ -18,10 +18,11 @@
  */
 
 import { buildQueryFromLucene } from '../from_lucene';
-import { decorateQuery } from '../../decorate_query';
-import { expectDeepEqual } from '../../../../../../test_utils/expect_deep_equal';
+import { decorateQuery } from '../decorate_query';
+import { expectDeepEqual } from '../../../test_utils/expect_deep_equal';
 import { luceneStringToDsl } from '../lucene_string_to_dsl';
 
+const configStub = { get: () => ({}) };
 
 describe('build query', function () {
 
@@ -46,11 +47,11 @@ describe('build query', function () {
 
       const expectedESQueries = queries.map(
         (query) => {
-          return decorateQuery(luceneStringToDsl(query.query));
+          return decorateQuery(luceneStringToDsl(query.query), configStub);
         }
       );
 
-      const result = buildQueryFromLucene(queries, decorateQuery);
+      const result = buildQueryFromLucene(queries, configStub);
 
       expectDeepEqual(result.must, expectedESQueries);
     });
@@ -60,7 +61,7 @@ describe('build query', function () {
         { query: { match_all: {} }, language: 'lucene' },
       ];
 
-      const result = buildQueryFromLucene(queries, decorateQuery);
+      const result = buildQueryFromLucene(queries, configStub);
 
       expectDeepEqual(result.must, [queries[0].query]);
     });

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

@@ -18,7 +18,7 @@
  */
 
 import { luceneStringToDsl } from '../lucene_string_to_dsl';
-import { expectDeepEqual } from '../../../../../../test_utils/expect_deep_equal.js';
+import { expectDeepEqual } from '../../../test_utils/expect_deep_equal';
 import expect from 'expect.js';
 
 describe('build query', function () {

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 {