fix(ElasticDSL): Small fixes in Elastic DSL types

Author: nodkz

src/elasticDSL/Aggs/AggRules.js

@@ -21,7 +21,7 @@ import { getValueCountITC } from './Metrics/ValueCount';
 
 import { getChildrenITC } from './Bucket/Children';
 import { getDateHistogramITC } from './Bucket/DateHistogram';
-import { getDateRangeITC } from './Bucket/DateRange';
+import { getAggsDateRangeITC } from './Bucket/DateRange';
 import { getDiversifiedSamplerITC } from './Bucket/DiversifiedSampler';
 import { getFilterITC } from './Bucket/Filter';
 import { getFiltersITC } from './Bucket/Filters';
@@ -86,7 +86,7 @@ export function getAggRulesITC(opts: mixed = {}): InputTypeComposer {
 
         children: () => getChildrenITC(opts),
         date_histogram: () => getDateHistogramITC(opts),
-        date_range: () => getDateRangeITC(opts),
+        date_range: () => getAggsDateRangeITC(opts),
         diversified_sampler: () => getDiversifiedSamplerITC(opts),
         filter: () => getFilterITC(opts),
         filters: () => getFiltersITC(opts),

src/elasticDSL/Aggs/Bucket/DateRange.js

@@ -2,10 +2,14 @@
 
 import { InputTypeComposer } from 'graphql-compose';
 import { getTypeName, getOrSetType, desc } from '../../../utils';
-import { getDateFormatFC, getDateTimeZoneFC } from '../../Commons/Date';
+import {
+  getDateFormatFC,
+  getDateTimeZoneFC,
+  getDateRangeITC,
+} from '../../Commons/Date';
 import { getDateFields } from '../../Commons/FieldNames';
 
-export function getDateRangeITC(opts: mixed = {}): InputTypeComposer {
+export function getAggsDateRangeITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('AggsDateRange', opts);
   const description = desc(
     `

src/elasticDSL/Aggs/Bucket/Terms.js

@@ -3,6 +3,7 @@
 import { InputTypeComposer } from 'graphql-compose';
 import { getTypeName, getOrSetType, desc } from '../../../utils';
 import { getCommonsScriptITC } from '../../Commons/Script';
+import { getTermFields } from '../../Commons/FieldNames';
 
 export function getTermsITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('AggsTerms', opts);
@@ -20,7 +21,7 @@ export function getTermsITC(opts: mixed = {}): InputTypeComposer {
       name,
       description,
       fields: {
-        field: 'String',
+        field: () => getTermFields(opts),
         size: {
           type: 'Int',
           defaultValue: 10,

src/elasticDSL/Aggs/__tests__/__snapshots__/Aggs-test.js.snap

@@ -171,7 +171,7 @@ input Elastic_AggsDateRange_50 {
 
   # Date Format/Patter. Eg \\"MM-yyy\\" returns \\"08-2012\\". [JodaDate](http://www.joda.org/joda-time/apidocs/org/joda/time/format/DateTimeFormat.html) 
   format: String
-  ranges: [Elastic_AggsDateRange_50]
+  ranges: [Elastic_DateRange_50]
 
   # Time zones may either be specified as an ISO 8601 UTC offset (e.g. +01:00 or
   # -08:00) or as one of the time zone ids from the [TZ
@@ -546,6 +546,21 @@ input Elastic_CommonsScript_50 {
   file: String
 }
 
+# Date range where \`from\` value includes and \`to\` value excludes.
+input Elastic_DateRange_50 {
+  # The expression starts with an anchor date, which can either be now, or a date
+  # string ending with ||. Eg \`2015-01-01||+1M/d\` means 2015-01-01 plus one month,
+  # rounded down to the nearest day. Or \`now+1h+1m\`. The supported time units: y,
+  # M, w, d, h, m, s 
+  from: String
+
+  # The expression starts with an anchor date, which can either be now, or a date
+  # string ending with ||. Eg \`2015-01-01||+1M/d\` means 2015-01-01 plus one month,
+  # rounded down to the nearest day. Or \`now+1h+1m\`. The supported time units: y,
+  # M, w, d, h, m, s 
+  to: String
+}
+
 # Float range where \`from\` value includes and \`to\` value excludes.
 input Elastic_FloatRange_50 {
   from: Float
@@ -652,18 +667,18 @@ input Elastic_Query_50 {
 # boolean clauses, each clause with a typed occurrence. [Documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-bool-query.html) 
 input Elastic_QueryBool_50 {
   # The clause (query) must appear in matching documents and will contribute to the score. 
-  must: Elastic_Query_50
+  must: [Elastic_Query_50]
 
   # The clause (query) must appear in matching documents. However unlike must the
   # score of the query will be ignored. Filter clauses are executed in filter
   # context, meaning that scoring is ignored and clauses are considered for caching. 
-  filter: Elastic_Query_50
+  filter: [Elastic_Query_50]
 
   # The clause (query) should appear in the matching document. In a boolean query
   # with no must or filter clauses, one or more should clauses must match a
   # document. The minimum number of should clauses to match can be set using the
   # minimum_should_match parameter. 
-  should: Elastic_Query_50
+  should: [Elastic_Query_50]
 
   # The minimum number of should clauses to match. 
   minimum_should_match: String
@@ -672,7 +687,7 @@ input Elastic_QueryBool_50 {
   # executed in filter context meaning that scoring is ignored and clauses are
   # considered for caching. Because scoring is ignored, a score of 0 for all
   # documents is returned. 
-  must_not: Elastic_Query_50
+  must_not: [Elastic_Query_50]
   boost: Float
 }
 

src/elasticDSL/Commons/FieldNames.js

@@ -81,6 +81,28 @@ export function getPercolatorFields(opts: mixed) {
   return getFieldNamesType(opts, ['percolator'], 'Percolator');
 }
 
+export function getTermFields(opts: mixed) {
+  return getFieldNamesType(
+    opts,
+    [
+      'keyword',
+      'date',
+      'boolean',
+      'ip',
+      'byte',
+      'short',
+      'integer',
+      'long',
+      'double',
+      'float',
+      'half_float',
+      'scaled_float',
+      'token_count',
+    ],
+    'Term'
+  );
+}
+
 export function getAllFields(opts: mixed) {
   return getFieldNamesType(opts, ['_all'], 'All');
 }
@@ -156,7 +178,7 @@ function getEnumValues(
   }
   getFieldNamesByElasticType(fieldMap, types).forEach(fieldName => {
     values[fieldName] = {
-      value: fieldName.replace('__', '.'),
+      value: fieldName.replace(/__/g, '.'),
     };
   });
   return values;

src/elasticDSL/Query/Compound/Bool.js

@@ -23,7 +23,7 @@ export function getBoolITC(opts: mixed = {}): InputTypeComposer {
       description,
       fields: {
         must: {
-          type: () => getQueryITC(opts),
+          type: () => [getQueryITC(opts)],
           description: desc(
             `
             The clause (query) must appear in matching documents
@@ -32,7 +32,7 @@ export function getBoolITC(opts: mixed = {}): InputTypeComposer {
           ),
         },
         filter: {
-          type: () => getQueryITC(opts),
+          type: () => [getQueryITC(opts)],
           description: desc(
             `
             The clause (query) must appear in matching documents.
@@ -43,7 +43,7 @@ export function getBoolITC(opts: mixed = {}): InputTypeComposer {
           ),
         },
         should: {
-          type: () => getQueryITC(opts),
+          type: () => [getQueryITC(opts)],
           description: desc(
             `
             The clause (query) should appear in the matching document.
@@ -63,7 +63,7 @@ export function getBoolITC(opts: mixed = {}): InputTypeComposer {
           ),
         },
         must_not: {
-          type: () => getQueryITC(opts),
+          type: () => [getQueryITC(opts)],
           description: desc(
             `
             The clause (query) must not appear in the matching documents.
@@ -79,22 +79,29 @@ export function getBoolITC(opts: mixed = {}): InputTypeComposer {
     }));
 }
 
+function prepareQueryMayBeArray(vals, fieldMap) {
+  if (Array.isArray(vals)) {
+    return vals.map(val => prepareQueryInResolve(val, fieldMap));
+  }
+  return prepareQueryInResolve(vals, fieldMap);
+}
+
 export function prepareBoolInResolve(
   bool: any,
   fieldMap: mixed
 ): { [argName: string]: any } {
   /* eslint-disable no-param-reassign */
   if (bool.must) {
-    bool.must = prepareQueryInResolve(bool.must, fieldMap);
+    bool.must = prepareQueryMayBeArray(bool.must, fieldMap);
   }
   if (bool.filter) {
-    bool.filter = prepareQueryInResolve(bool.filter, fieldMap);
+    bool.filter = prepareQueryMayBeArray(bool.filter, fieldMap);
   }
   if (bool.should) {
-    bool.should = prepareQueryInResolve(bool.should, fieldMap);
+    bool.should = prepareQueryMayBeArray(bool.should, fieldMap);
   }
   if (bool.must_not) {
-    bool.must_not = prepareQueryInResolve(bool.must_not, fieldMap);
+    bool.must_not = prepareQueryMayBeArray(bool.must_not, fieldMap);
   }
 
   return bool;

src/elasticDSL/Query/FullText/Match.js

@@ -2,7 +2,7 @@
 
 import { InputTypeComposer } from 'graphql-compose';
 import { getTypeName, getOrSetType, desc } from '../../../utils';
-import { getAllAsFieldConfigMap } from '../../Commons/FieldNames';
+import { getAnalyzedAsFieldConfigMap } from '../../Commons/FieldNames';
 
 export function getMatchITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('QueryMatch', opts);
@@ -14,7 +14,7 @@ export function getMatchITC(opts: mixed = {}): InputTypeComposer {
   );
 
   const subName = getTypeName('QueryMatchSettings', opts);
-  const fields = getAllAsFieldConfigMap(
+  const fields = getAnalyzedAsFieldConfigMap(
     opts,
     getOrSetType(subName, () =>
       // $FlowFixMe

src/elasticDSL/Query/Query.js

@@ -215,7 +215,7 @@ export function prepareQueryInResolve(
 export function renameUndescoredToDots(obj: any, fieldMap: mixed) {
   const result = {};
   Object.keys(obj).forEach(o => {
-    result[o.replace('__', '.')] = obj[o];
+    result[o.replace(/__/g, '.')] = obj[o];
   });
   return result;
 }

src/elasticDSL/Query/TermLevel/Terms.js

@@ -14,7 +14,7 @@ export function getTermsITC(opts: mixed = {}): InputTypeComposer {
   `
   );
 
-  const fields = getAllAsFieldConfigMap(opts, 'JSON');
+  const fields = getAllAsFieldConfigMap(opts, '[JSON]');
 
   if (typeof fields === 'object') {
     return getOrSetType(name, () =>

src/elasticDSL/Query/__tests__/__snapshots__/Query-test.js.snap

@@ -97,18 +97,18 @@ input Elastic_Query_50 {
 # boolean clauses, each clause with a typed occurrence. [Documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-bool-query.html) 
 input Elastic_QueryBool_50 {
   # The clause (query) must appear in matching documents and will contribute to the score. 
-  must: Elastic_Query_50
+  must: [Elastic_Query_50]
 
   # The clause (query) must appear in matching documents. However unlike must the
   # score of the query will be ignored. Filter clauses are executed in filter
   # context, meaning that scoring is ignored and clauses are considered for caching. 
-  filter: Elastic_Query_50
+  filter: [Elastic_Query_50]
 
   # The clause (query) should appear in the matching document. In a boolean query
   # with no must or filter clauses, one or more should clauses must match a
   # document. The minimum number of should clauses to match can be set using the
   # minimum_should_match parameter. 
-  should: Elastic_Query_50
+  should: [Elastic_Query_50]
 
   # The minimum number of should clauses to match. 
   minimum_should_match: String
@@ -117,7 +117,7 @@ input Elastic_QueryBool_50 {
   # executed in filter context meaning that scoring is ignored and clauses are
   # considered for caching. Because scoring is ignored, a score of 0 for all
   # documents is returned. 
-  must_not: Elastic_Query_50
+  must_not: [Elastic_Query_50]
   boost: Float
 }
 

src/elasticDSL/Sort.js

@@ -44,7 +44,7 @@ export function getSortITC(opts: any = {}): InputTypeComposer | string {
       },
     };
     sortableFields.forEach(fieldName => {
-      const dottedName = fieldName.replace('__', '.');
+      const dottedName = fieldName.replace(/__/g, '.');
       values[`${fieldName}__asc`] = {
         value: { [dottedName]: 'asc' },
       };