feat(FieldNames): Add avaliable fieldNames in Aggs according to mapping

nodkz · nodkz · commit 8edee3f9283f · 2017-03-18T22:43:59.000+06:00
diff --git a/src/ElasticDSL/Aggs/AggBlock.js b/src/ElasticDSL/Aggs/AggBlock.js
@@ -6,12 +6,14 @@ import { getAggRulesITC } from './AggRules';
 
 export function getAggBlockITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('AggBlock', opts);
-  const description = desc(`
+  const description = desc(
+    `
     The aggregations framework helps provide aggregated data based on
     a search query. It is based on simple building blocks called aggregations,
     that can be composed in order to build complex summaries of the data.
     [Documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations.html)
-  `);
+  `
+  );
 
   return getOrSetType(name, () =>
     // $FlowFixMe
@@ -28,6 +30,5 @@ export function getAggBlockITC(opts: mixed = {}): InputTypeComposer {
           description: 'Aggregation rules',
         },
       },
-    })
-  );
+    }));
 }
diff --git a/src/ElasticDSL/Aggs/Bucket/DateHistogram.js b/src/ElasticDSL/Aggs/Bucket/DateHistogram.js
@@ -8,6 +8,7 @@ import {
   getDateFormatFC,
   getDateTimeZoneFC,
 } from '../../Commons/Date';
+import { getDateFields } from '../../Commons/FieldNames';
 
 export function getDateHistogramITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('AggsDateHistogram', opts);
@@ -25,12 +26,12 @@ export function getDateHistogramITC(opts: mixed = {}): InputTypeComposer {
       name,
       description,
       fields: {
-        field: 'String',
+        field: getDateFields(opts),
         interval: getDateIntervalFC(opts),
         time_zone: getDateTimeZoneFC(opts),
         offset: getDateIntervalFC(opts),
         format: getDateFormatFC(opts),
-        missing: 'Float',
+        missing: 'String',
         script: () => getCommonsScriptITC(opts),
       },
     }));
diff --git a/src/ElasticDSL/Aggs/Bucket/DateRange.js b/src/ElasticDSL/Aggs/Bucket/DateRange.js
@@ -3,6 +3,7 @@
 import { InputTypeComposer } from 'graphql-compose';
 import { getTypeName, getOrSetType, desc } from '../../../utils';
 import { getDateFormatFC, getDateTimeZoneFC } from '../../Commons/Date';
+import { getDateFields } from '../../Commons/FieldNames';
 
 export function getDateRangeITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('AggsDateRange', opts);
@@ -24,7 +25,7 @@ export function getDateRangeITC(opts: mixed = {}): InputTypeComposer {
       name,
       description,
       fields: {
-        field: 'String',
+        field: getDateFields(opts),
         format: getDateFormatFC(opts),
         ranges: () => [getDateRangeITC(opts)],
         time_zone: getDateTimeZoneFC(opts),
diff --git a/src/ElasticDSL/Aggs/Bucket/DiversifiedSampler.js b/src/ElasticDSL/Aggs/Bucket/DiversifiedSampler.js
@@ -3,6 +3,7 @@
 import { InputTypeComposer } from 'graphql-compose';
 import { getTypeName, getOrSetType, desc } from '../../../utils';
 import { getCommonsScriptITC } from '../../Commons/Script';
+import { getAllFields } from '../../Commons/FieldNames';
 
 export function getDiversifiedSamplerITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('AggsDiversifiedSampler', opts);
@@ -25,7 +26,7 @@ export function getDiversifiedSamplerITC(opts: mixed = {}): InputTypeComposer {
           type: 'String',
           defaultValue: 100,
         },
-        field: 'String',
+        field: getAllFields(opts),
         max_docs_per_value: 'Int',
         script: () => getCommonsScriptITC(opts),
         execution_hint: 'String',
diff --git a/src/ElasticDSL/Aggs/Bucket/GeoDistance.js b/src/ElasticDSL/Aggs/Bucket/GeoDistance.js
@@ -8,6 +8,7 @@ import {
   getDistanceCalculationModeFC,
 } from '../../Commons/Geo';
 import { getFloatRangeITC } from '../../Commons/Float';
+import { getGeoPointFields } from '../../Commons/FieldNames';
 
 export function getGeoDistanceITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('AggsGeoDistance', opts);
@@ -27,7 +28,7 @@ export function getGeoDistanceITC(opts: mixed = {}): InputTypeComposer {
       name,
       description,
       fields: {
-        field: 'String',
+        field: getGeoPointFields(opts),
         origin: getGeoPointFC(opts),
         ranges: [getFloatRangeITC(opts)],
         unit: getDistanceUnitFC(opts),
diff --git a/src/ElasticDSL/Aggs/Bucket/GeohashGrid.js b/src/ElasticDSL/Aggs/Bucket/GeohashGrid.js
@@ -2,6 +2,7 @@
 
 import { InputTypeComposer } from 'graphql-compose';
 import { getTypeName, getOrSetType, desc } from '../../../utils';
+import { getGeoPointFields } from '../../Commons/FieldNames';
 
 export function getGeohashGridITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('AggsGeohashGrid', opts);
@@ -21,7 +22,7 @@ export function getGeohashGridITC(opts: mixed = {}): InputTypeComposer {
       name,
       description,
       fields: {
-        field: 'String',
+        field: getGeoPointFields(opts),
         precision: 'Int',
         size: {
           type: 'Int',
diff --git a/src/ElasticDSL/Aggs/Bucket/Global.js b/src/ElasticDSL/Aggs/Bucket/Global.js
@@ -21,7 +21,7 @@ export function getGlobalITC(opts: mixed = {}): InputTypeComposer {
       name,
       description,
       fields: {
-        without_fields: 'JSON',
+        _without_fields_: 'JSON',
       },
     }));
 }
diff --git a/src/ElasticDSL/Aggs/Bucket/Histogram.js b/src/ElasticDSL/Aggs/Bucket/Histogram.js
@@ -2,6 +2,7 @@
 
 import { InputTypeComposer } from 'graphql-compose';
 import { getTypeName, getOrSetType, desc } from '../../../utils';
+import { getNumericFields } from '../../Commons/FieldNames';
 
 export function getHistogramITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('AggsHistogram', opts);
@@ -20,7 +21,7 @@ export function getHistogramITC(opts: mixed = {}): InputTypeComposer {
       name,
       description,
       fields: {
-        field: 'String',
+        field: getNumericFields(opts),
         interval: 'Float',
         missing: 'Float',
         min_doc_count: 'Int',
diff --git a/src/ElasticDSL/Aggs/Bucket/IpRange.js b/src/ElasticDSL/Aggs/Bucket/IpRange.js
@@ -3,6 +3,7 @@
 import { InputTypeComposer } from 'graphql-compose';
 import { getTypeName, getOrSetType, desc } from '../../../utils';
 import { getIpRangeTypeITC } from '../../Commons/Ip';
+import { getIpFields } from '../../Commons/FieldNames';
 
 export function getIpRangeITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('AggsIpRange', opts);
@@ -21,7 +22,7 @@ export function getIpRangeITC(opts: mixed = {}): InputTypeComposer {
       name,
       description,
       fields: {
-        field: 'String',
+        field: getIpFields(opts),
         ranges: () => [getIpRangeTypeITC(opts)],
       },
     }));
diff --git a/src/ElasticDSL/Aggs/Bucket/Missing.js b/src/ElasticDSL/Aggs/Bucket/Missing.js
@@ -2,6 +2,7 @@
 
 import { InputTypeComposer } from 'graphql-compose';
 import { getTypeName, getOrSetType, desc } from '../../../utils';
+import { getAllFields } from '../../Commons/FieldNames';
 
 export function getMissingITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('AggsMissing', opts);
@@ -20,7 +21,7 @@ export function getMissingITC(opts: mixed = {}): InputTypeComposer {
       name,
       description,
       fields: {
-        field: 'String',
+        field: getAllFields(opts),
       },
     }));
 }
diff --git a/src/ElasticDSL/Aggs/Bucket/Range.js b/src/ElasticDSL/Aggs/Bucket/Range.js
@@ -4,6 +4,7 @@ import { InputTypeComposer } from 'graphql-compose';
 import { getTypeName, getOrSetType, desc } from '../../../utils';
 import { getFloatRangeKeyedITC } from '../../Commons/Float';
 import { getCommonsScriptITC } from '../../Commons/Script';
+import { getNumericFields } from '../../Commons/FieldNames';
 
 export function getRangeITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('AggsRange', opts);
@@ -23,7 +24,7 @@ export function getRangeITC(opts: mixed = {}): InputTypeComposer {
       name,
       description,
       fields: {
-        field: 'String',
+        field: getNumericFields(opts),
         ranges: () => [getFloatRangeKeyedITC(opts)],
         keyed: 'Boolean',
         script: () => getCommonsScriptITC(opts),
diff --git a/src/ElasticDSL/Aggs/Bucket/SignificantTerms.js b/src/ElasticDSL/Aggs/Bucket/SignificantTerms.js
@@ -2,6 +2,7 @@
 
 import { InputTypeComposer } from 'graphql-compose';
 import { getTypeName, getOrSetType, desc } from '../../../utils';
+import { getAllFields } from '../../Commons/FieldNames';
 
 export function getSignificantTermsITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('AggsSignificantTerms', opts);
@@ -19,7 +20,7 @@ export function getSignificantTermsITC(opts: mixed = {}): InputTypeComposer {
       name,
       description,
       fields: {
-        field: 'String',
+        field: getAllFields(opts),
         min_doc_count: 'Int',
         background_filter: 'JSON',
         execution_hint: 'String',
diff --git a/src/ElasticDSL/Aggs/Metrics/Avg.js b/src/ElasticDSL/Aggs/Metrics/Avg.js
@@ -3,6 +3,7 @@
 import { InputTypeComposer } from 'graphql-compose';
 import { getTypeName, getOrSetType, desc } from '../../../utils';
 import { getCommonsScriptITC } from '../../Commons/Script';
+import { getNumericFields } from '../../Commons/FieldNames';
 
 export function getAvgITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('AggsAvg', opts);
@@ -22,7 +23,7 @@ export function getAvgITC(opts: mixed = {}): InputTypeComposer {
       name,
       description,
       fields: {
-        field: 'String',
+        field: getNumericFields(opts),
         missing: 'Float',
         script: () => getCommonsScriptITC(opts),
       },
diff --git a/src/ElasticDSL/Aggs/Metrics/Cardinality.js b/src/ElasticDSL/Aggs/Metrics/Cardinality.js
@@ -3,6 +3,7 @@
 import { InputTypeComposer } from 'graphql-compose';
 import { getTypeName, getOrSetType, desc } from '../../../utils';
 import { getCommonsScriptITC } from '../../Commons/Script';
+import { getAllFields } from '../../Commons/FieldNames';
 
 export function getCardinalityITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('AggsCardinality', opts);
@@ -21,7 +22,7 @@ export function getCardinalityITC(opts: mixed = {}): InputTypeComposer {
       name,
       description,
       fields: {
-        field: 'String',
+        field: getAllFields(opts),
         precision_threshold: {
           type: 'Int',
           defaultValue: 3000,
diff --git a/src/ElasticDSL/Aggs/Metrics/ExtendedStats.js b/src/ElasticDSL/Aggs/Metrics/ExtendedStats.js
@@ -3,6 +3,7 @@
 import { InputTypeComposer } from 'graphql-compose';
 import { getTypeName, getOrSetType, desc } from '../../../utils';
 import { getCommonsScriptITC } from '../../Commons/Script';
+import { getNumericFields } from '../../Commons/FieldNames';
 
 export function getExtendedStatsITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('AggsExtendedStats', opts);
@@ -22,7 +23,7 @@ export function getExtendedStatsITC(opts: mixed = {}): InputTypeComposer {
       name,
       description,
       fields: {
-        field: 'String',
+        field: getNumericFields(opts),
         sigma: 'Float',
         missing: 'Float',
         script: () => getCommonsScriptITC(opts),
diff --git a/src/ElasticDSL/Aggs/Metrics/GeoBounds.js b/src/ElasticDSL/Aggs/Metrics/GeoBounds.js
@@ -2,6 +2,7 @@
 
 import { InputTypeComposer } from 'graphql-compose';
 import { getTypeName, getOrSetType, desc } from '../../../utils';
+import { getGeoPointFields } from '../../Commons/FieldNames';
 
 export function getGeoBoundsITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('AggsGeoBounds', opts);
@@ -19,7 +20,7 @@ export function getGeoBoundsITC(opts: mixed = {}): InputTypeComposer {
       name,
       description,
       fields: {
-        field: 'String!',
+        field: getGeoPointFields(opts),
         wrap_longitude: 'Boolean',
       },
     }));
diff --git a/src/ElasticDSL/Aggs/Metrics/GeoCentroid.js b/src/ElasticDSL/Aggs/Metrics/GeoCentroid.js
@@ -2,6 +2,7 @@
 
 import { InputTypeComposer } from 'graphql-compose';
 import { getTypeName, getOrSetType, desc } from '../../../utils';
+import { getGeoPointFields } from '../../Commons/FieldNames';
 
 export function getGeoCentroidITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('AggsGeoCentroid', opts);
@@ -19,7 +20,7 @@ export function getGeoCentroidITC(opts: mixed = {}): InputTypeComposer {
       name,
       description,
       fields: {
-        field: 'String!',
+        field: getGeoPointFields(opts),
       },
     }));
 }
diff --git a/src/ElasticDSL/Aggs/Metrics/Max.js b/src/ElasticDSL/Aggs/Metrics/Max.js
@@ -3,14 +3,15 @@
 import { InputTypeComposer } from 'graphql-compose';
 import { getTypeName, getOrSetType, desc } from '../../../utils';
 import { getCommonsScriptITC } from '../../Commons/Script';
+import { getNumericFields } from '../../Commons/FieldNames';
 
 export function getMaxITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('AggsMax', opts);
   const description = desc(
     `
     A single-value metrics aggregation that keeps track and returns the maximum
     value among the numeric values extracted from the aggregated documents.
-    These values can be extracted either from specific numeric fields 
+    These values can be extracted either from specific numeric fields
     in the documents, or be generated by a provided script.
     [Documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-max-aggregation.html)
   `
@@ -22,7 +23,7 @@ export function getMaxITC(opts: mixed = {}): InputTypeComposer {
       name,
       description,
       fields: {
-        field: 'String',
+        field: getNumericFields(opts),
         missing: 'Float',
         script: () => getCommonsScriptITC(opts),
       },
diff --git a/src/ElasticDSL/Aggs/Metrics/Min.js b/src/ElasticDSL/Aggs/Metrics/Min.js
@@ -3,6 +3,7 @@
 import { InputTypeComposer } from 'graphql-compose';
 import { getTypeName, getOrSetType, desc } from '../../../utils';
 import { getCommonsScriptITC } from '../../Commons/Script';
+import { getNumericFields } from '../../Commons/FieldNames';
 
 export function getMinITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('AggsMin', opts);
@@ -22,7 +23,7 @@ export function getMinITC(opts: mixed = {}): InputTypeComposer {
       name,
       description,
       fields: {
-        field: 'String',
+        field: getNumericFields(opts),
         missing: 'Float',
         script: () => getCommonsScriptITC(opts),
       },
diff --git a/src/ElasticDSL/Aggs/Metrics/PercentileRanks.js b/src/ElasticDSL/Aggs/Metrics/PercentileRanks.js
@@ -4,6 +4,7 @@ import { InputTypeComposer } from 'graphql-compose';
 import { getTypeName, getOrSetType, desc } from '../../../utils';
 import { getCommonsScriptITC } from '../../Commons/Script';
 import { getCommonsHdrITC } from '../../Commons/HDR';
+import { getNumericFields } from '../../Commons/FieldNames';
 
 export function getPercentileRanksITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('AggsPercentileRanks', opts);
@@ -23,7 +24,7 @@ export function getPercentileRanksITC(opts: mixed = {}): InputTypeComposer {
       name,
       description,
       fields: {
-        field: 'String',
+        field: getNumericFields(opts),
         values: '[Float]',
         hdr: () => getCommonsHdrITC(opts),
         missing: 'Float',
diff --git a/src/ElasticDSL/Aggs/Metrics/Percentiles.js b/src/ElasticDSL/Aggs/Metrics/Percentiles.js
@@ -4,6 +4,7 @@ import { InputTypeComposer } from 'graphql-compose';
 import { getTypeName, getOrSetType, desc } from '../../../utils';
 import { getCommonsScriptITC } from '../../Commons/Script';
 import { getCommonsHdrITC } from '../../Commons/HDR';
+import { getNumericFields } from '../../Commons/FieldNames';
 
 export function getPercentilesITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('AggsPercentiles', opts);
@@ -23,7 +24,7 @@ export function getPercentilesITC(opts: mixed = {}): InputTypeComposer {
       name,
       description,
       fields: {
-        field: 'String',
+        field: getNumericFields(opts),
         percents: '[Float]',
         tdigest: `input ${getTypeName('AggsPercentilesTDigest', opts)} {
           compression: Int,
diff --git a/src/ElasticDSL/Aggs/Metrics/Stats.js b/src/ElasticDSL/Aggs/Metrics/Stats.js
@@ -3,6 +3,7 @@
 import { InputTypeComposer } from 'graphql-compose';
 import { getTypeName, getOrSetType, desc } from '../../../utils';
 import { getCommonsScriptITC } from '../../Commons/Script';
+import { getNumericFields } from '../../Commons/FieldNames';
 
 export function getStatsITC(opts: mixed = {}): InputTypeComposer {
   const name = getTypeName('AggsStats', opts);
@@ -22,7 +23,7 @@ export function getStatsITC(opts: mixed = {}): InputTypeComposer {
       name,
       description,
       fields: {
-        field: 'String',
+        field: getNumericFields(opts),
         missing: 'Float',
         script: () => getCommonsScriptITC(opts),
       },
diff --git a/src/ElasticDSL/Aggs/Metrics/Sum.js b/src/ElasticDSL/Aggs/Metrics/Sum.js
diff --git a/src/ElasticDSL/Aggs/Metrics/ValueCount.js b/src/ElasticDSL/Aggs/Metrics/ValueCount.js
diff --git a/src/ElasticDSL/Aggs/__tests__/converter-test.js b/src/ElasticDSL/Aggs/__tests__/converter-test.js
diff --git a/src/ElasticDSL/Aggs/converter.js b/src/ElasticDSL/Aggs/converter.js
diff --git a/src/ElasticDSL/SearchBody.js b/src/ElasticDSL/SearchBody.js
diff --git a/src/ElasticDSL/__tests__/__snapshots__/SearchDSL-test.js.snap b/src/ElasticDSL/__tests__/__snapshots__/SearchDSL-test.js.snap
diff --git a/src/elasticDSL/Commons/FieldNames.js b/src/elasticDSL/Commons/FieldNames.js
diff --git a/src/mappingConverter.js b/src/mappingConverter.js

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ export function getGlobalITC(opts: mixed = {}): InputTypeComposer {`
`21`	`21`	`name,`
`22`	`22`	`description,`
`23`	`23`	`fields: {`
`24`		`- without_fields: 'JSON',`
	`24`	`+ _without_fields_: 'JSON',`
`25`	`25`	`},`
`26`	`26`	`}));`
`27`	`27`	`}`