Move buildEsQuery to a package

.eslintignore

@@ -8,8 +8,6 @@ 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
 /test/fixtures/scenarios
 /src/core_plugins/console/public/webpackShims
 /src/core_plugins/console/public/tests/webpackShims
@@ -19,6 +17,8 @@ bower_components
 /packages/*/target
 /packages/eslint-config-kibana
 /packages/eslint-plugin-kibana-custom
+/packages/kbn-es-query/src/kuery/ast/kuery.js
+/packages/kbn-es-query/src/kuery/ast/legacy_kuery.js
 /packages/kbn-pm/dist
 /packages/kbn-plugin-generator/sao_template/template
 /packages/kbn-ui-framework/dist

package.json

@@ -88,6 +88,7 @@
     "@kbn/babel-preset": "1.0.0",
     "@kbn/config-schema": "1.0.0",
     "@kbn/datemath": "5.0.0",
+    "@kbn/es-query": "1.0.0",
     "@kbn/i18n": "1.0.0",
     "@kbn/pm": "1.0.0",
     "@kbn/test-subj-selector": "0.2.1",
@@ -384,4 +385,4 @@
     "node": "8.11.4",
     "yarn": "^1.10.1"
   }
-}
+}

packages/kbn-es-query/.babelrc

@@ -0,0 +1,3 @@
+{
+  "presets": ["@kbn/babel-preset/webpack_preset"]
+}

src/ui/public/kuery/index.d.ts → packages/kbn-es-query/index.d.ts

@@ -17,4 +17,4 @@
  * under the License.
  */
 
-export * from 'ui/kuery/ast';
+export * from './src';

packages/kbn-es-query/package.json

@@ -0,0 +1,20 @@
+{
+  "name": "@kbn/es-query",
+  "main": "target/index.js",
+  "version": "1.0.0",
+  "license": "Apache-2.0",
+  "private": true,
+  "scripts": {
+    "build": "babel src --out-dir target",
+    "kbn:bootstrap": "yarn build",
+    "kbn:watch": "yarn build --watch"
+  },
+  "dependencies": {
+    "lodash": "npm:@elastic/[email protected]"
+  },
+  "devDependencies": {
+    "@kbn/babel-preset": "1.0.0",
+    "babel-cli": "^6.26.0",
+    "expect.js": "0.3.1"
+  }
+}

packages/kbn-es-query/src/__fixtures__/filter_skeleton.json

@@ -0,0 +1,5 @@
+{
+  "meta": {
+    "index": "logstash-*"
+  }
+}

src/ui/public/kuery/__tests__/index_pattern_response.json → packages/kbn-es-query/src/__fixtures__/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 → packages/kbn-es-query/src/es_query/__tests__/build_es_query.js

@@ -17,26 +17,23 @@
  * under the License.
  */
 
+import expect from 'expect.js';
 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 '../../__fixtures__/index_pattern_response.json';
+import { fromKueryExpression, toElasticsearchQuery } from '../../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();
@@ -48,7 +45,7 @@ describe('build query', function () {
           must_not: [],
         }
       };
-      expectDeepEqual(result, expected);
+      expect(result).to.eql(expected);
     });
 
     it('should combine queries and filters from multiple query languages into a single ES bool query', function () {
@@ -66,7 +63,7 @@ describe('build query', function () {
       const expectedResult = {
         bool: {
           must: [
-            decorateQuery(luceneStringToDsl('bar:baz')),
+            decorateQuery(luceneStringToDsl('bar:baz'), configStub),
             { match_all: {} },
           ],
           filter: [
@@ -79,7 +76,7 @@ describe('build query', function () {
 
       const result = buildEsQuery(indexPattern, queries, filters);
 
-      expectDeepEqual(result, expectedResult);
+      expect(result).to.eql(expectedResult);
     });
 
   });

src/ui/public/courier/search_source/__tests__/decorate_query.js → packages/kbn-es-query/src/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 → packages/kbn-es-query/src/es_query/__tests__/from_filters.js

@@ -17,14 +17,11 @@
  * under the License.
  */
 
+import expect from 'expect.js';
 import { buildQueryFromFilters } from '../from_filters';
-import ngMock from 'ng_mock';
-import { expectDeepEqual } from '../../../../../../test_utils/expect_deep_equal.js';
 
 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 = {
@@ -33,7 +30,7 @@ describe('build query', function () {
         should: [],
         must_not: [],
       };
-      expectDeepEqual(result, expected);
+      expect(result).to.eql(expected);
     });
 
     it('should transform an array of kibana filters into ES queries combined in the bool clauses', function () {
@@ -55,7 +52,7 @@ describe('build query', function () {
 
       const result = buildQueryFromFilters(filters);
 
-      expectDeepEqual(result.must, expectedESQueries);
+      expect(result.must).to.eql(expectedESQueries);
     });
 
     it('should place negated filters in the must_not clause', function () {
@@ -70,7 +67,7 @@ describe('build query', function () {
 
       const result = buildQueryFromFilters(filters);
 
-      expectDeepEqual(result.must_not, expectedESQueries);
+      expect(result.must_not).to.eql(expectedESQueries);
     });
 
     it('should translate old ES filter syntax into ES 5+ query objects', function () {
@@ -89,7 +86,7 @@ describe('build query', function () {
 
       const result = buildQueryFromFilters(filters);
 
-      expectDeepEqual(result.must, expectedESQueries);
+      expect(result.must).to.eql(expectedESQueries);
     });
 
     it('should migrate deprecated match syntax', function () {
@@ -108,7 +105,7 @@ describe('build query', function () {
 
       const result = buildQueryFromFilters(filters);
 
-      expectDeepEqual(result.must, expectedESQueries);
+      expect(result.must).to.eql(expectedESQueries);
     });
 
     it('should not add query:queryString:options to query_string filters', function () {
@@ -122,7 +119,7 @@ describe('build query', function () {
 
       const result = buildQueryFromFilters(filters);
 
-      expectDeepEqual(result.must, expectedESQueries);
+      expect(result.must).to.eql(expectedESQueries);
     });
   });
 });

src/ui/public/courier/search_source/build_query/__tests__/from_kuery.js → packages/kbn-es-query/src/es_query/__tests__/from_kuery.js

@@ -18,24 +18,14 @@
  */
 
 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 '../../__fixtures__/index_pattern_response.json';
 import expect from 'expect.js';
-import { fromKueryExpression, toElasticsearchQuery } from '../../../../kuery';
-
-let indexPattern;
+import { fromKueryExpression, toElasticsearchQuery } from '../../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 = {
@@ -44,7 +34,7 @@ describe('build query', function () {
         should: [],
         must_not: [],
       };
-      expectDeepEqual(result, expected);
+      expect(result).to.eql(expected);
     });
 
     it('should transform an array of kuery queries into ES queries combined in the bool\'s filter clause', function () {
@@ -61,7 +51,7 @@ describe('build query', function () {
 
       const result = buildQueryFromKuery(indexPattern, queries, configStub);
 
-      expectDeepEqual(result.filter, expectedESQueries);
+      expect(result.filter).to.eql(expectedESQueries);
     });
 
     it('should throw a useful error if it looks like query is using an old, unsupported syntax', function () {

src/ui/public/courier/search_source/build_query/__tests__/from_lucene.js → packages/kbn-es-query/src/es_query/__tests__/from_lucene.js

@@ -17,11 +17,12 @@
  * under the License.
  */
 
+import expect from 'expect.js';
 import { buildQueryFromLucene } from '../from_lucene';
-import { decorateQuery } from '../../decorate_query';
-import { expectDeepEqual } from '../../../../../../test_utils/expect_deep_equal';
+import { decorateQuery } from '../decorate_query';
 import { luceneStringToDsl } from '../lucene_string_to_dsl';
 
+const configStub = { get: () => ({}) };
 
 describe('build query', function () {
 
@@ -35,7 +36,7 @@ describe('build query', function () {
         should: [],
         must_not: [],
       };
-      expectDeepEqual(result, expected);
+      expect(result).to.eql(expected);
     });
 
     it('should transform an array of lucene queries into ES queries combined in the bool\'s must clause', function () {
@@ -46,23 +47,23 @@ 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);
+      expect(result.must).to.eql(expectedESQueries);
     });
 
     it('should also accept queries in ES query DSL format, simply passing them through', function () {
       const queries = [
         { query: { match_all: {} }, language: 'lucene' },
       ];
 
-      const result = buildQueryFromLucene(queries, decorateQuery);
+      const result = buildQueryFromLucene(queries, configStub);
 
-      expectDeepEqual(result.must, [queries[0].query]);
+      expect(result.must).to.eql([queries[0].query]);
     });
 
   });

src/ui/public/courier/search_source/build_query/__tests__/lucene_string_to_dsl.js → packages/kbn-es-query/src/es_query/__tests__/lucene_string_to_dsl.js

@@ -18,7 +18,6 @@
  */
 
 import { luceneStringToDsl } from '../lucene_string_to_dsl';
-import { expectDeepEqual } from '../../../../../../test_utils/expect_deep_equal.js';
 import expect from 'expect.js';
 
 describe('build query', function () {
@@ -30,23 +29,23 @@ describe('build query', function () {
       const expectedResult = {
         query_string: { query: 'foo:bar' }
       };
-      expectDeepEqual(result, expectedResult);
+      expect(result).to.eql(expectedResult);
     });
 
     it('should return a match_all query for empty strings and whitespace', function () {
       const expectedResult = {
         match_all: {}
       };
 
-      expectDeepEqual(luceneStringToDsl(''), expectedResult);
-      expectDeepEqual(luceneStringToDsl('   '), expectedResult);
+      expect(luceneStringToDsl('')).to.eql(expectedResult);
+      expect(luceneStringToDsl('   ')).to.eql(expectedResult);
     });
 
     it('should return non-string arguments without modification', function () {
       const expectedResult = {};
       const result = luceneStringToDsl(expectedResult);
       expect(result).to.be(expectedResult);
-      expectDeepEqual(result, expectedResult);
+      expect(result).to.eql(expectedResult);
     });
 
   });

src/ui/public/courier/search_source/build_query/build_es_query.js → packages/kbn-es-query/src/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 {