From c4e7bf6eff7c1c2efad8a7a3a0dd9e554f2d696a Mon Sep 17 00:00:00 2001 From: Laura Trotta Date: Tue, 16 Jul 2024 18:10:35 +0200 Subject: [PATCH 1/5] making range aggregation untagged union --- compiler/src/steps/validate-model.ts | 1 + output/openapi/elasticsearch-openapi.json | 77 ++++++ .../elasticsearch-serverless-openapi.json | 77 ++++++ output/schema/schema-serverless.json | 238 ++++++++++++++++- output/schema/schema.json | 247 +++++++++++++++++- output/typescript/types.ts | 18 ++ specification/_types/aggregations/bucket.ts | 24 +- 7 files changed, 674 insertions(+), 8 deletions(-) diff --git a/compiler/src/steps/validate-model.ts b/compiler/src/steps/validate-model.ts index 272da3251b..829d9a60d7 100644 --- a/compiler/src/steps/validate-model.ts +++ b/compiler/src/steps/validate-model.ts @@ -599,6 +599,7 @@ export default async function validateModel (apiModel: model.Model, restSpec: Ma } else if (variants.kind === 'untagged') { if (fqn(parentName) !== '_types.query_dsl:DecayFunction' && fqn(parentName) !== '_types.query_dsl:DistanceFeatureQuery' && + fqn(parentName) !== '_types.aggregations:AggregationRange' && fqn(parentName) !== '_types.query_dsl:RangeQuery') { throw new Error(`Please contact the devtools team before adding new untagged variant ${fqn(parentName)}`) } diff --git a/output/openapi/elasticsearch-openapi.json b/output/openapi/elasticsearch-openapi.json index 384c07454e..2adf408d0d 100644 --- a/output/openapi/elasticsearch-openapi.json +++ b/output/openapi/elasticsearch-openapi.json @@ -55014,6 +55014,56 @@ ] }, "_types.aggregations:AggregationRange": { + "oneOf": [ + { + "$ref": "#/components/schemas/_types.aggregations:UntypedAggregationRange" + }, + { + "$ref": "#/components/schemas/_types.aggregations:NumberAggregationRange" + }, + { + "$ref": "#/components/schemas/_types.aggregations:StringAggregationRange" + } + ] + }, + "_types.aggregations:UntypedAggregationRange": { + "allOf": [ + { + "$ref": "#/components/schemas/_types.aggregations:AggregationRangeBase" + }, + { + "type": "object" + } + ] + }, + "_types.aggregations:AggregationRangeBase": { + "type": "object", + "properties": { + "from": { + "description": "Start of the range (inclusive).", + "type": "object" + }, + "key": { + "description": "Custom key to return the range with.", + "type": "string" + }, + "to": { + "description": "End of the range (exclusive).", + "type": "object" + } + } + }, + "_types.aggregations:NumberAggregationRange": { + "allOf": [ + { + "$ref": "#/components/schemas/_types.aggregations:AggregationRangeBasedouble" + }, + { + "type": "object" + } + ] + }, + "_types.aggregations:AggregationRangeBasedouble": { "type": "object", "properties": { "from": { @@ -55046,6 +55096,33 @@ } } }, + "_types.aggregations:StringAggregationRange": { + "allOf": [ + { + "$ref": "#/components/schemas/_types.aggregations:AggregationRangeBasestring" + }, + { + "type": "object" + } + ] + }, + "_types.aggregations:AggregationRangeBasestring": { + "type": "object", + "properties": { + "from": { + "description": "Start of the range (inclusive).", + "type": "string" + }, + "key": { + "description": "Custom key to return the range with.", + "type": "string" + }, + "to": { + "description": "End of the range (exclusive).", + "type": "string" + } + } + }, "_types.aggregations:GeoHashGridAggregation": { "allOf": [ { diff --git a/output/openapi/elasticsearch-serverless-openapi.json b/output/openapi/elasticsearch-serverless-openapi.json index 31848e3387..fde4015de5 100644 --- a/output/openapi/elasticsearch-serverless-openapi.json +++ b/output/openapi/elasticsearch-serverless-openapi.json @@ -34153,6 +34153,56 @@ ] }, "_types.aggregations:AggregationRange": { + "oneOf": [ + { + "$ref": "#/components/schemas/_types.aggregations:UntypedAggregationRange" + }, + { + "$ref": "#/components/schemas/_types.aggregations:NumberAggregationRange" + }, + { + "$ref": "#/components/schemas/_types.aggregations:StringAggregationRange" + } + ] + }, + "_types.aggregations:UntypedAggregationRange": { + "allOf": [ + { + "$ref": "#/components/schemas/_types.aggregations:AggregationRangeBase" + }, + { + "type": "object" + } + ] + }, + "_types.aggregations:AggregationRangeBase": { + "type": "object", + "properties": { + "from": { + "description": "Start of the range (inclusive).", + "type": "object" + }, + "key": { + "description": "Custom key to return the range with.", + "type": "string" + }, + "to": { + "description": "End of the range (exclusive).", + "type": "object" + } + } + }, + "_types.aggregations:NumberAggregationRange": { + "allOf": [ + { + "$ref": "#/components/schemas/_types.aggregations:AggregationRangeBasedouble" + }, + { + "type": "object" + } + ] + }, + "_types.aggregations:AggregationRangeBasedouble": { "type": "object", "properties": { "from": { @@ -34185,6 +34235,33 @@ } } }, + "_types.aggregations:StringAggregationRange": { + "allOf": [ + { + "$ref": "#/components/schemas/_types.aggregations:AggregationRangeBasestring" + }, + { + "type": "object" + } + ] + }, + "_types.aggregations:AggregationRangeBasestring": { + "type": "object", + "properties": { + "from": { + "description": "Start of the range (inclusive).", + "type": "string" + }, + "key": { + "description": "Custom key to return the range with.", + "type": "string" + }, + "to": { + "description": "End of the range (exclusive).", + "type": "string" + } + } + }, "_types.aggregations:GeoHashGridAggregation": { "allOf": [ { diff --git a/output/schema/schema-serverless.json b/output/schema/schema-serverless.json index 017a12d569..60fb08c0f3 100644 --- a/output/schema/schema-serverless.json +++ b/output/schema/schema-serverless.json @@ -67007,7 +67007,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1117-L1182" +======= + "specLocation": "_types/aggregations/bucket.ts#L1060-L1124" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "codegenNames": [ @@ -67019,7 +67023,11 @@ "name": "CategorizeTextAnalyzer", "namespace": "_types.aggregations" }, +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1184-L1187", +======= + "specLocation": "_types/aggregations/bucket.ts#L1126-L1129", +>>>>>>> 9fd43f8ed (making range aggregation untagged union) "type": { "items": [ { @@ -67087,7 +67095,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1189-L1193" +======= + "specLocation": "_types/aggregations/bucket.ts#L1131-L1135" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "inherits": { @@ -67967,7 +67979,11 @@ "name": "AggregateOrder", "namespace": "_types.aggregations" }, +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1052-L1054", +======= + "specLocation": "_types/aggregations/bucket.ts#L998-L1000", +>>>>>>> 9fd43f8ed (making range aggregation untagged union) "type": { "items": [ { @@ -68446,7 +68462,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1240-L1267" +======= + "specLocation": "_types/aggregations/bucket.ts#L1182-L1206" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "interface", @@ -68491,7 +68511,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1226-L1238" +======= + "specLocation": "_types/aggregations/bucket.ts#L1168-L1180" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "codegenNames": [ @@ -68503,7 +68527,11 @@ "name": "TermsExclude", "namespace": "_types.aggregations" }, +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1077-L1078", +======= + "specLocation": "_types/aggregations/bucket.ts#L1023-L1024", +>>>>>>> 9fd43f8ed (making range aggregation untagged union) "type": { "items": [ { @@ -68538,7 +68566,11 @@ "name": "TermsInclude", "namespace": "_types.aggregations" }, +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1074-L1075", +======= + "specLocation": "_types/aggregations/bucket.ts#L1020-L1021", +>>>>>>> 9fd43f8ed (making range aggregation untagged union) "type": { "items": [ { @@ -68601,7 +68633,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1080-L1089" +======= + "specLocation": "_types/aggregations/bucket.ts#L1026-L1035" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "inherits": { @@ -68881,17 +68917,90 @@ "specLocation": "_types/aggregations/bucket.ts#L396-L419" }, { - "kind": "interface", + "codegenNames": [ + "untyped", + "number", + "string" + ], + "kind": "type_alias", "name": { "name": "AggregationRange", "namespace": "_types.aggregations" }, + "specLocation": "_types/aggregations/bucket.ts#L674-L681", + "type": { + "items": [ + { + "kind": "instance_of", + "type": { + "name": "UntypedAggregationRange", + "namespace": "_types.aggregations" + } + }, + { + "kind": "instance_of", + "type": { + "name": "NumberAggregationRange", + "namespace": "_types.aggregations" + } + }, + { + "kind": "instance_of", + "type": { + "name": "StringAggregationRange", + "namespace": "_types.aggregations" + } + } + ], + "kind": "union_of" + }, + "variants": { + "kind": "untagged", + "untypedVariant": { + "name": "UntypedAggregationRange", + "namespace": "_types.aggregations" + } + } + }, + { + "inherits": { + "generics": [ + { + "kind": "user_defined_value" + } + ], + "type": { + "name": "AggregationRangeBase", + "namespace": "_types.aggregations" + } + }, + "kind": "interface", + "name": { + "name": "UntypedAggregationRange", + "namespace": "_types.aggregations" + }, + "properties": [], + "specLocation": "_types/aggregations/bucket.ts#L702-L702" + }, + { + "generics": [ + { + "name": "T", + "namespace": "_types.aggregations.AggregationRangeBase" + } + ], + "kind": "interface", + "name": { + "name": "AggregationRangeBase", + "namespace": "_types.aggregations" + }, "properties": [ { "description": "Start of the range (inclusive).", "name": "from", "required": false, "type": { +<<<<<<< HEAD "items": [ { "kind": "instance_of", @@ -68909,6 +69018,13 @@ } ], "kind": "union_of" +======= + "kind": "instance_of", + "type": { + "name": "T", + "namespace": "_types.aggregations.AggregationRangeBase" + } +>>>>>>> 9fd43f8ed (making range aggregation untagged union) } }, { @@ -68928,6 +69044,7 @@ "name": "to", "required": false, "type": { +<<<<<<< HEAD "items": [ { "kind": "instance_of", @@ -68949,6 +69066,65 @@ } ], "specLocation": "_types/aggregations/bucket.ts#L691-L704" +======= + "kind": "instance_of", + "type": { + "name": "T", + "namespace": "_types.aggregations.AggregationRangeBase" + } + } + } + ], + "specLocation": "_types/aggregations/bucket.ts#L683-L696" + }, + { + "inherits": { + "generics": [ + { + "kind": "instance_of", + "type": { + "name": "double", + "namespace": "_types" + } + } + ], + "type": { + "name": "AggregationRangeBase", + "namespace": "_types.aggregations" + } + }, + "kind": "interface", + "name": { + "name": "NumberAggregationRange", + "namespace": "_types.aggregations" + }, + "properties": [], + "specLocation": "_types/aggregations/bucket.ts#L698-L698" + }, + { + "inherits": { + "generics": [ + { + "kind": "instance_of", + "type": { + "name": "string", + "namespace": "_builtins" + } + } + ], + "type": { + "name": "AggregationRangeBase", + "namespace": "_types.aggregations" + } + }, + "kind": "interface", + "name": { + "name": "StringAggregationRange", + "namespace": "_types.aggregations" + }, + "properties": [], + "specLocation": "_types/aggregations/bucket.ts#L700-L700" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "extDocId": "search-aggregations-bucket-geohashgrid-aggregation", @@ -69731,7 +69907,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1195-L1224" +======= + "specLocation": "_types/aggregations/bucket.ts#L1137-L1166" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "inherits": { @@ -70812,7 +70992,11 @@ "name": "TermsAggregationCollectMode", "namespace": "_types.aggregations" }, +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1056-L1065" +======= + "specLocation": "_types/aggregations/bucket.ts#L1002-L1011" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "interface", @@ -71386,7 +71570,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L706-L739" +======= + "specLocation": "_types/aggregations/bucket.ts#L704-L734" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "inherits": { @@ -71473,7 +71661,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L741-L747" +======= + "specLocation": "_types/aggregations/bucket.ts#L736-L742" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "extDocId": "search-aggregations-random-sampler-aggregation", @@ -71546,7 +71738,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L771-L780" +======= + "specLocation": "_types/aggregations/bucket.ts#L744-L750" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "inherits": { @@ -71858,7 +72054,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L817-L884" +======= + "specLocation": "_types/aggregations/bucket.ts#L787-L851" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "interface", @@ -71892,7 +72092,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L782-L791" +======= + "specLocation": "_types/aggregations/bucket.ts#L752-L761" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "enum", @@ -71914,7 +72118,11 @@ "name": "TermsAggregationExecutionHint", "namespace": "_types.aggregations" }, +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1067-L1072" +======= + "specLocation": "_types/aggregations/bucket.ts#L1013-L1018" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "interface", @@ -71936,7 +72144,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L793-L798" +======= + "specLocation": "_types/aggregations/bucket.ts#L763-L768" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "interface", @@ -71970,7 +72182,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L800-L809" +======= + "specLocation": "_types/aggregations/bucket.ts#L770-L779" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "interface", @@ -71979,7 +72195,11 @@ "namespace": "_types.aggregations" }, "properties": [], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L811-L811" +======= + "specLocation": "_types/aggregations/bucket.ts#L781-L781" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "interface", @@ -72000,7 +72220,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L813-L815" +======= + "specLocation": "_types/aggregations/bucket.ts#L783-L785" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "extDocId": "search-aggregations-bucket-significanttext-aggregation", @@ -72223,7 +72447,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L886-L961" +======= + "specLocation": "_types/aggregations/bucket.ts#L853-L925" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "inherits": { @@ -72534,6 +72762,7 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L963-L1031" }, { @@ -72578,6 +72807,9 @@ } ], "specLocation": "_types/aggregations/bucket.ts#L1033-L1046" +======= + "specLocation": "_types/aggregations/bucket.ts#L927-L992" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "inherits": { @@ -73205,7 +73437,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1091-L1115" +======= + "specLocation": "_types/aggregations/bucket.ts#L1037-L1058" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "interface", diff --git a/output/schema/schema.json b/output/schema/schema.json index ed3a49c837..a522cd7df9 100644 --- a/output/schema/schema.json +++ b/output/schema/schema.json @@ -55827,7 +55827,11 @@ "name": "AggregateOrder", "namespace": "_types.aggregations" }, +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1052-L1054", +======= + "specLocation": "_types/aggregations/bucket.ts#L998-L1000", +>>>>>>> 9fd43f8ed (making range aggregation untagged union) "type": { "kind": "union_of", "items": [ @@ -57058,17 +57062,70 @@ } }, { - "kind": "interface", + "codegenNames": [ + "untyped", + "number", + "string" + ], + "kind": "type_alias", "name": { "name": "AggregationRange", "namespace": "_types.aggregations" }, + "specLocation": "_types/aggregations/bucket.ts#L674-L681", + "type": { + "items": [ + { + "kind": "instance_of", + "type": { + "name": "UntypedAggregationRange", + "namespace": "_types.aggregations" + } + }, + { + "kind": "instance_of", + "type": { + "name": "NumberAggregationRange", + "namespace": "_types.aggregations" + } + }, + { + "kind": "instance_of", + "type": { + "name": "StringAggregationRange", + "namespace": "_types.aggregations" + } + } + ], + "kind": "union_of" + }, + "variants": { + "kind": "untagged", + "untypedVariant": { + "name": "UntypedAggregationRange", + "namespace": "_types.aggregations" + } + } + }, + { + "generics": [ + { + "name": "T", + "namespace": "_types.aggregations.AggregationRangeBase" + } + ], + "kind": "interface", + "name": { + "name": "AggregationRangeBase", + "namespace": "_types.aggregations" + }, "properties": [ { "description": "Start of the range (inclusive).", "name": "from", "required": false, "type": { +<<<<<<< HEAD "kind": "union_of", "items": [ { @@ -57086,6 +57143,13 @@ } } ] +======= + "kind": "instance_of", + "type": { + "name": "T", + "namespace": "_types.aggregations.AggregationRangeBase" + } +>>>>>>> 9fd43f8ed (making range aggregation untagged union) } }, { @@ -57105,6 +57169,7 @@ "name": "to", "required": false, "type": { +<<<<<<< HEAD "kind": "union_of", "items": [ { @@ -57126,6 +57191,17 @@ } ], "specLocation": "_types/aggregations/bucket.ts#L691-L704" +======= + "kind": "instance_of", + "type": { + "name": "T", + "namespace": "_types.aggregations.AggregationRangeBase" + } + } + } + ], + "specLocation": "_types/aggregations/bucket.ts#L683-L696" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "interface", @@ -58418,7 +58494,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1117-L1182" +======= + "specLocation": "_types/aggregations/bucket.ts#L1060-L1124" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "type_alias", @@ -58430,7 +58510,11 @@ "name": "CategorizeTextAnalyzer", "namespace": "_types.aggregations" }, +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1184-L1187", +======= + "specLocation": "_types/aggregations/bucket.ts#L1126-L1129", +>>>>>>> 9fd43f8ed (making range aggregation untagged union) "type": { "kind": "union_of", "items": [ @@ -58483,7 +58567,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L782-L791" +======= + "specLocation": "_types/aggregations/bucket.ts#L752-L761" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "interface", @@ -59106,7 +59194,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1189-L1193" +======= + "specLocation": "_types/aggregations/bucket.ts#L1131-L1135" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "interface", @@ -60519,7 +60611,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1240-L1267" +======= + "specLocation": "_types/aggregations/bucket.ts#L1182-L1206" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "interface", @@ -60619,7 +60715,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1226-L1238" +======= + "specLocation": "_types/aggregations/bucket.ts#L1168-L1180" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "enum", @@ -61506,7 +61606,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L793-L798" +======= + "specLocation": "_types/aggregations/bucket.ts#L763-L768" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "interface", @@ -62401,7 +62505,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1195-L1224" +======= + "specLocation": "_types/aggregations/bucket.ts#L1137-L1166" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "interface", @@ -64029,7 +64137,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L800-L809" +======= + "specLocation": "_types/aggregations/bucket.ts#L770-L779" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "interface", @@ -64146,7 +64258,34 @@ "specLocation": "_types/aggregations/pipeline.ts#L361-L387" }, { +<<<<<<< HEAD "kind": "interface", +======= + "inherits": { + "generics": [ + { + "kind": "instance_of", + "type": { + "name": "double", + "namespace": "_types" + } + } + ], + "type": { + "name": "AggregationRangeBase", + "namespace": "_types.aggregations" + } + }, + "kind": "interface", + "name": { + "name": "NumberAggregationRange", + "namespace": "_types.aggregations" + }, + "properties": [], + "specLocation": "_types/aggregations/bucket.ts#L698-L698" + }, + { +>>>>>>> 9fd43f8ed (making range aggregation untagged union) "attachedBehaviors": [ "AdditionalProperties" ], @@ -64201,7 +64340,11 @@ "namespace": "_types.aggregations" }, "properties": [], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L811-L811" +======= + "specLocation": "_types/aggregations/bucket.ts#L781-L781" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "interface", @@ -64857,7 +65000,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L706-L739" +======= + "specLocation": "_types/aggregations/bucket.ts#L704-L734" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "interface", @@ -65006,7 +65153,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L741-L747" +======= + "specLocation": "_types/aggregations/bucket.ts#L736-L742" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "interface", @@ -65056,7 +65207,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L771-L780" +======= + "specLocation": "_types/aggregations/bucket.ts#L744-L750" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "enum", @@ -65099,7 +65254,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L813-L815" +======= + "specLocation": "_types/aggregations/bucket.ts#L783-L785" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "interface", @@ -65613,7 +65772,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L817-L884" +======= + "specLocation": "_types/aggregations/bucket.ts#L787-L851" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "interface", @@ -65877,7 +66040,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L886-L961" +======= + "specLocation": "_types/aggregations/bucket.ts#L853-L925" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "interface", @@ -66468,7 +66635,34 @@ "specLocation": "_types/aggregations/pipeline.ts#L410-L410" }, { +<<<<<<< HEAD "kind": "interface", +======= + "inherits": { + "generics": [ + { + "kind": "instance_of", + "type": { + "name": "string", + "namespace": "_builtins" + } + } + ], + "type": { + "name": "AggregationRangeBase", + "namespace": "_types.aggregations" + } + }, + "kind": "interface", + "name": { + "name": "StringAggregationRange", + "namespace": "_types.aggregations" + }, + "properties": [], + "specLocation": "_types/aggregations/bucket.ts#L700-L700" + }, + { +>>>>>>> 9fd43f8ed (making range aggregation untagged union) "description": "Result of the `rare_terms` aggregation when the field is a string.", "inherits": { "generics": [ @@ -67299,7 +67493,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L963-L1031" +======= + "specLocation": "_types/aggregations/bucket.ts#L927-L992" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "enum", @@ -67317,7 +67515,11 @@ "name": "TermsAggregationCollectMode", "namespace": "_types.aggregations" }, +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1056-L1065" +======= + "specLocation": "_types/aggregations/bucket.ts#L1002-L1011" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "enum", @@ -67339,7 +67541,11 @@ "name": "TermsAggregationExecutionHint", "namespace": "_types.aggregations" }, +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1067-L1072" +======= + "specLocation": "_types/aggregations/bucket.ts#L1013-L1018" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "interface", @@ -67381,7 +67587,11 @@ "name": "TermsExclude", "namespace": "_types.aggregations" }, +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1077-L1078", +======= + "specLocation": "_types/aggregations/bucket.ts#L1023-L1024", +>>>>>>> 9fd43f8ed (making range aggregation untagged union) "type": { "kind": "union_of", "items": [ @@ -67416,7 +67626,11 @@ "name": "TermsInclude", "namespace": "_types.aggregations" }, +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1074-L1075", +======= + "specLocation": "_types/aggregations/bucket.ts#L1020-L1021", +>>>>>>> 9fd43f8ed (making range aggregation untagged union) "type": { "kind": "union_of", "items": [ @@ -67479,7 +67693,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1080-L1089" +======= + "specLocation": "_types/aggregations/bucket.ts#L1026-L1035" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "interface", @@ -68155,7 +68373,30 @@ "variantName": "umterms" }, { +<<<<<<< HEAD + "kind": "interface", +======= + "inherits": { + "generics": [ + { + "kind": "user_defined_value" + } + ], + "type": { + "name": "AggregationRangeBase", + "namespace": "_types.aggregations" + } + }, "kind": "interface", + "name": { + "name": "UntypedAggregationRange", + "namespace": "_types.aggregations" + }, + "properties": [], + "specLocation": "_types/aggregations/bucket.ts#L702-L702" + }, + { +>>>>>>> 9fd43f8ed (making range aggregation untagged union) "description": "Value count aggregation result. `value` is always present.", "extDocId": "search-aggregations-metrics-valuecount-aggregation", "extDocUrl": "https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-valuecount-aggregation.html", @@ -68323,7 +68564,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1091-L1115" +======= + "specLocation": "_types/aggregations/bucket.ts#L1037-L1058" +>>>>>>> 9fd43f8ed (making range aggregation untagged union) }, { "kind": "interface", diff --git a/output/typescript/types.ts b/output/typescript/types.ts index d0ddbb2dc7..056f39fb0c 100644 --- a/output/typescript/types.ts +++ b/output/typescript/types.ts @@ -3174,10 +3174,19 @@ export interface AggregationsAggregationContainer { variable_width_histogram?: AggregationsVariableWidthHistogramAggregation } +<<<<<<< HEAD export interface AggregationsAggregationRange { from?: double | null key?: string to?: double | null +======= +export type AggregationsAggregationRange = AggregationsUntypedAggregationRange | AggregationsNumberAggregationRange | AggregationsStringAggregationRange + +export interface AggregationsAggregationRangeBase { + from?: T + key?: string + to?: T +>>>>>>> 9fd43f8ed (making range aggregation untagged union) } export interface AggregationsArrayPercentilesItem { @@ -3997,6 +4006,9 @@ export interface AggregationsNormalizeAggregation extends AggregationsPipelineAg export type AggregationsNormalizeMethod = 'rescale_0_1' | 'rescale_0_100' | 'percent_of_sum' | 'mean' | 'z-score' | 'softmax' +export interface AggregationsNumberAggregationRange extends AggregationsAggregationRangeBase { +} + export interface AggregationsParentAggregateKeys extends AggregationsSingleBucketAggregateBase { } export type AggregationsParentAggregate = AggregationsParentAggregateKeys @@ -4255,6 +4267,9 @@ export interface AggregationsStatsBucketAggregate extends AggregationsStatsAggre export interface AggregationsStatsBucketAggregation extends AggregationsPipelineAggregationBase { } +export interface AggregationsStringAggregationRange extends AggregationsAggregationRangeBase { +} + export interface AggregationsStringRareTermsAggregate extends AggregationsMultiBucketAggregateBase { } @@ -4436,6 +4451,9 @@ export interface AggregationsUnmappedSignificantTermsAggregate extends Aggregati export interface AggregationsUnmappedTermsAggregate extends AggregationsTermsAggregateBase { } +export interface AggregationsUntypedAggregationRange extends AggregationsAggregationRangeBase { +} + export interface AggregationsValueCountAggregate extends AggregationsSingleMetricAggregateBase { } diff --git a/specification/_types/aggregations/bucket.ts b/specification/_types/aggregations/bucket.ts index 88c6238ca9..b4e23c020d 100644 --- a/specification/_types/aggregations/bucket.ts +++ b/specification/_types/aggregations/bucket.ts @@ -688,11 +688,20 @@ export class RangeAggregation extends BucketAggregationBase { format?: string } -export class AggregationRange { +/** + * @codegen_names untyped, number, string + * @variants untagged untyped=_types.aggregations.UntypedAggregationRange + */ +export type AggregationRange = + | UntypedAggregationRange + | NumberAggregationRange + | StringAggregationRange + +export class AggregationRangeBase { /** * Start of the range (inclusive). */ - from?: double | null + from?: T /** * Custom key to return the range with. */ @@ -700,12 +709,15 @@ export class AggregationRange { /** * End of the range (exclusive). */ - to?: double | null + to?: T } -/** - * @ext_doc_id search-aggregations-bucket-rare-terms-aggregation - */ +export class NumberAggregationRange extends AggregationRangeBase {} + +export class StringAggregationRange extends AggregationRangeBase {} + +export class UntypedAggregationRange extends AggregationRangeBase {} + export class RareTermsAggregation extends BucketAggregationBase { /** * Terms that should be excluded from the aggregation. From 6678f222546a2ad891a8277ee1bf8ea5b42dcd6e Mon Sep 17 00:00:00 2001 From: Laura Trotta Date: Wed, 17 Jul 2024 10:52:37 +0200 Subject: [PATCH 2/5] same as range query --- compiler/src/steps/validate-model.ts | 4 +- output/openapi/elasticsearch-openapi.json | 21 +- .../elasticsearch-serverless-openapi.json | 21 +- output/schema/schema-serverless.json | 291 +++++++++++++++++- output/schema/schema.json | 253 ++++++++++++++- output/typescript/types.ts | 21 +- specification/_types/aggregations/bucket.ts | 47 +-- 7 files changed, 590 insertions(+), 68 deletions(-) diff --git a/compiler/src/steps/validate-model.ts b/compiler/src/steps/validate-model.ts index 829d9a60d7..ad7ec1745b 100644 --- a/compiler/src/steps/validate-model.ts +++ b/compiler/src/steps/validate-model.ts @@ -597,9 +597,9 @@ export default async function validateModel (apiModel: model.Model, restSpec: Ma validateValueOf(valueOf, openGenerics) } else if (variants.kind === 'untagged') { - if (fqn(parentName) !== '_types.query_dsl:DecayFunction' && + if (fqn(parentName) !== '_types.aggregations:AggregationRange' && + fqn(parentName) !== '_types.query_dsl:DecayFunction' && fqn(parentName) !== '_types.query_dsl:DistanceFeatureQuery' && - fqn(parentName) !== '_types.aggregations:AggregationRange' && fqn(parentName) !== '_types.query_dsl:RangeQuery') { throw new Error(`Please contact the devtools team before adding new untagged variant ${fqn(parentName)}`) } diff --git a/output/openapi/elasticsearch-openapi.json b/output/openapi/elasticsearch-openapi.json index 2adf408d0d..e4e4284534 100644 --- a/output/openapi/elasticsearch-openapi.json +++ b/output/openapi/elasticsearch-openapi.json @@ -54703,7 +54703,7 @@ "description": "Array of date ranges.", "type": "array", "items": { - "$ref": "#/components/schemas/_types.aggregations:DateRangeExpression" + "$ref": "#/components/schemas/_types.aggregations:DateAggregationRange" } }, "time_zone": { @@ -54717,7 +54717,17 @@ } ] }, - "_types.aggregations:DateRangeExpression": { + "_types.aggregations:DateAggregationRange": { + "allOf": [ + { + "$ref": "#/components/schemas/_types.aggregations:AggregationRangeBaseFieldDateMath" + }, + { + "type": "object" + } + ] + }, + "_types.aggregations:AggregationRangeBaseFieldDateMath": { "type": "object", "properties": { "from": { @@ -55018,11 +55028,14 @@ { "$ref": "#/components/schemas/_types.aggregations:UntypedAggregationRange" }, + { + "$ref": "#/components/schemas/_types.aggregations:DateAggregationRange" + }, { "$ref": "#/components/schemas/_types.aggregations:NumberAggregationRange" }, { - "$ref": "#/components/schemas/_types.aggregations:StringAggregationRange" + "$ref": "#/components/schemas/_types.aggregations:TermAggregationRange" } ] }, @@ -55096,7 +55109,7 @@ } } }, - "_types.aggregations:StringAggregationRange": { + "_types.aggregations:TermAggregationRange": { "allOf": [ { "$ref": "#/components/schemas/_types.aggregations:AggregationRangeBasestring" diff --git a/output/openapi/elasticsearch-serverless-openapi.json b/output/openapi/elasticsearch-serverless-openapi.json index fde4015de5..761fe11524 100644 --- a/output/openapi/elasticsearch-serverless-openapi.json +++ b/output/openapi/elasticsearch-serverless-openapi.json @@ -33842,7 +33842,7 @@ "description": "Array of date ranges.", "type": "array", "items": { - "$ref": "#/components/schemas/_types.aggregations:DateRangeExpression" + "$ref": "#/components/schemas/_types.aggregations:DateAggregationRange" } }, "time_zone": { @@ -33856,7 +33856,17 @@ } ] }, - "_types.aggregations:DateRangeExpression": { + "_types.aggregations:DateAggregationRange": { + "allOf": [ + { + "$ref": "#/components/schemas/_types.aggregations:AggregationRangeBaseFieldDateMath" + }, + { + "type": "object" + } + ] + }, + "_types.aggregations:AggregationRangeBaseFieldDateMath": { "type": "object", "properties": { "from": { @@ -34157,11 +34167,14 @@ { "$ref": "#/components/schemas/_types.aggregations:UntypedAggregationRange" }, + { + "$ref": "#/components/schemas/_types.aggregations:DateAggregationRange" + }, { "$ref": "#/components/schemas/_types.aggregations:NumberAggregationRange" }, { - "$ref": "#/components/schemas/_types.aggregations:StringAggregationRange" + "$ref": "#/components/schemas/_types.aggregations:TermAggregationRange" } ] }, @@ -34235,7 +34248,7 @@ } } }, - "_types.aggregations:StringAggregationRange": { + "_types.aggregations:TermAggregationRange": { "allOf": [ { "$ref": "#/components/schemas/_types.aggregations:AggregationRangeBasestring" diff --git a/output/schema/schema-serverless.json b/output/schema/schema-serverless.json index 60fb08c0f3..81e37c1644 100644 --- a/output/schema/schema-serverless.json +++ b/output/schema/schema-serverless.json @@ -67007,11 +67007,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1117-L1182" ======= "specLocation": "_types/aggregations/bucket.ts#L1060-L1124" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L1048-L1112" +>>>>>>> 07886ab3f (same as range query) }, { "codegenNames": [ @@ -67023,11 +67027,15 @@ "name": "CategorizeTextAnalyzer", "namespace": "_types.aggregations" }, +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1184-L1187", ======= "specLocation": "_types/aggregations/bucket.ts#L1126-L1129", >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L1114-L1117", +>>>>>>> 07886ab3f (same as range query) "type": { "items": [ { @@ -67095,11 +67103,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1189-L1193" ======= "specLocation": "_types/aggregations/bucket.ts#L1131-L1135" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L1119-L1123" +>>>>>>> 07886ab3f (same as range query) }, { "inherits": { @@ -67971,7 +67983,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L508-L517" +======= + "specLocation": "_types/aggregations/bucket.ts#L467-L476" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "type_alias", @@ -67979,11 +67995,15 @@ "name": "AggregateOrder", "namespace": "_types.aggregations" }, +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1052-L1054", ======= "specLocation": "_types/aggregations/bucket.ts#L998-L1000", >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L986-L988", +>>>>>>> 07886ab3f (same as range query) "type": { "items": [ { @@ -68087,7 +68107,7 @@ "value": { "kind": "instance_of", "type": { - "name": "DateRangeExpression", + "name": "DateAggregationRange", "namespace": "_types.aggregations" } } @@ -68121,9 +68141,39 @@ "specLocation": "_types/aggregations/bucket.ts#L281-L307" }, { + "inherits": { + "generics": [ + { + "kind": "instance_of", + "type": { + "name": "FieldDateMath", + "namespace": "_types.aggregations" + } + } + ], + "type": { + "name": "AggregationRangeBase", + "namespace": "_types.aggregations" + } + }, + "kind": "interface", + "name": { + "name": "DateAggregationRange", + "namespace": "_types.aggregations" + }, + "properties": [], + "specLocation": "_types/aggregations/bucket.ts#L681-L681" + }, + { + "generics": [ + { + "name": "T", + "namespace": "_types.aggregations.AggregationRangeBase" + } + ], "kind": "interface", "name": { - "name": "DateRangeExpression", + "name": "AggregationRangeBase", "namespace": "_types.aggregations" }, "properties": [ @@ -68134,8 +68184,8 @@ "type": { "kind": "instance_of", "type": { - "name": "FieldDateMath", - "namespace": "_types.aggregations" + "name": "T", + "namespace": "_types.aggregations.AggregationRangeBase" } } }, @@ -68158,12 +68208,13 @@ "type": { "kind": "instance_of", "type": { - "name": "FieldDateMath", - "namespace": "_types.aggregations" + "name": "T", + "namespace": "_types.aggregations.AggregationRangeBase" } } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L318-L331" }, { @@ -68212,6 +68263,9 @@ "namespace": "_builtins" } } +======= + "specLocation": "_types/aggregations/bucket.ts#L660-L673" +>>>>>>> 07886ab3f (same as range query) }, { "inherits": { @@ -68306,7 +68360,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L333-L357" +======= + "specLocation": "_types/aggregations/bucket.ts#L298-L319" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "enum", @@ -68328,7 +68386,11 @@ "name": "SamplerAggregationExecutionHint", "namespace": "_types.aggregations" }, +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L359-L372" +======= + "specLocation": "_types/aggregations/bucket.ts#L321-L334" +>>>>>>> 07886ab3f (same as range query) }, { "inherits": { @@ -68462,11 +68524,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1240-L1267" ======= "specLocation": "_types/aggregations/bucket.ts#L1182-L1206" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L1170-L1194" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -68511,11 +68577,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1226-L1238" ======= "specLocation": "_types/aggregations/bucket.ts#L1168-L1180" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L1156-L1168" +>>>>>>> 07886ab3f (same as range query) }, { "codegenNames": [ @@ -68527,11 +68597,15 @@ "name": "TermsExclude", "namespace": "_types.aggregations" }, +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1077-L1078", ======= "specLocation": "_types/aggregations/bucket.ts#L1023-L1024", >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L1011-L1012", +>>>>>>> 07886ab3f (same as range query) "type": { "items": [ { @@ -68566,11 +68640,15 @@ "name": "TermsInclude", "namespace": "_types.aggregations" }, +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1074-L1075", ======= "specLocation": "_types/aggregations/bucket.ts#L1020-L1021", >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L1008-L1009", +>>>>>>> 07886ab3f (same as range query) "type": { "items": [ { @@ -68633,11 +68711,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1080-L1089" ======= "specLocation": "_types/aggregations/bucket.ts#L1026-L1035" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L1014-L1023" +>>>>>>> 07886ab3f (same as range query) }, { "inherits": { @@ -68712,7 +68794,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L374-L394" +======= + "specLocation": "_types/aggregations/bucket.ts#L336-L356" +>>>>>>> 07886ab3f (same as range query) }, { "codegenNames": [ @@ -68914,20 +69000,25 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L396-L419" +======= + "specLocation": "_types/aggregations/bucket.ts#L358-L381" +>>>>>>> 07886ab3f (same as range query) }, { "codegenNames": [ "untyped", + "date", "number", - "string" + "term" ], "kind": "type_alias", "name": { "name": "AggregationRange", "namespace": "_types.aggregations" }, - "specLocation": "_types/aggregations/bucket.ts#L674-L681", + "specLocation": "_types/aggregations/bucket.ts#L650-L658", "type": { "items": [ { @@ -68937,6 +69028,13 @@ "namespace": "_types.aggregations" } }, + { + "kind": "instance_of", + "type": { + "name": "DateAggregationRange", + "namespace": "_types.aggregations" + } + }, { "kind": "instance_of", "type": { @@ -68947,7 +69045,7 @@ { "kind": "instance_of", "type": { - "name": "StringAggregationRange", + "name": "TermAggregationRange", "namespace": "_types.aggregations" } } @@ -68980,6 +69078,7 @@ "namespace": "_types.aggregations" }, "properties": [], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L702-L702" }, { @@ -69076,6 +69175,9 @@ } ], "specLocation": "_types/aggregations/bucket.ts#L683-L696" +======= + "specLocation": "_types/aggregations/bucket.ts#L679-L679" +>>>>>>> 07886ab3f (same as range query) }, { "inherits": { @@ -69099,7 +69201,7 @@ "namespace": "_types.aggregations" }, "properties": [], - "specLocation": "_types/aggregations/bucket.ts#L698-L698" + "specLocation": "_types/aggregations/bucket.ts#L675-L675" }, { "inherits": { @@ -69119,12 +69221,16 @@ }, "kind": "interface", "name": { - "name": "StringAggregationRange", + "name": "TermAggregationRange", "namespace": "_types.aggregations" }, "properties": [], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L700-L700" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L677-L677" +>>>>>>> 07886ab3f (same as range query) }, { "extDocId": "search-aggregations-bucket-geohashgrid-aggregation", @@ -69204,7 +69310,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L421-L449" +======= + "specLocation": "_types/aggregations/bucket.ts#L383-L408" +>>>>>>> 07886ab3f (same as range query) }, { "codegenNames": [ @@ -69430,7 +69540,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L451-L477" +======= + "specLocation": "_types/aggregations/bucket.ts#L410-L436" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "type_alias", @@ -69523,7 +69637,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L479-L504" +======= + "specLocation": "_types/aggregations/bucket.ts#L438-L463" +>>>>>>> 07886ab3f (same as range query) }, { "inherits": { @@ -69538,7 +69656,11 @@ "namespace": "_types.aggregations" }, "properties": [], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L506-L506" +======= + "specLocation": "_types/aggregations/bucket.ts#L465-L465" +>>>>>>> 07886ab3f (same as range query) }, { "inherits": { @@ -69703,7 +69825,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L519-L565" +======= + "specLocation": "_types/aggregations/bucket.ts#L478-L524" +>>>>>>> 07886ab3f (same as range query) }, { "inherits": { @@ -69746,7 +69872,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L567-L576" +======= + "specLocation": "_types/aggregations/bucket.ts#L526-L535" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -69816,7 +69946,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L578-L591" +======= + "specLocation": "_types/aggregations/bucket.ts#L537-L550" +>>>>>>> 07886ab3f (same as range query) }, { "inherits": { @@ -69907,11 +70041,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1195-L1224" ======= "specLocation": "_types/aggregations/bucket.ts#L1137-L1166" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L1125-L1154" +>>>>>>> 07886ab3f (same as range query) }, { "inherits": { @@ -70312,7 +70450,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L593-L599" +======= + "specLocation": "_types/aggregations/bucket.ts#L552-L558" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "type_alias", @@ -70974,7 +71116,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L601-L641" +======= + "specLocation": "_types/aggregations/bucket.ts#L560-L600" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "enum", @@ -70992,11 +71138,15 @@ "name": "TermsAggregationCollectMode", "namespace": "_types.aggregations" }, +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1056-L1065" ======= "specLocation": "_types/aggregations/bucket.ts#L1002-L1011" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L990-L999" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -71030,7 +71180,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L643-L653" +======= + "specLocation": "_types/aggregations/bucket.ts#L602-L612" +>>>>>>> 07886ab3f (same as range query) }, { "inherits": { @@ -71058,7 +71212,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L655-L660" +======= + "specLocation": "_types/aggregations/bucket.ts#L614-L619" +>>>>>>> 07886ab3f (same as range query) }, { "extDocId": "search-aggregations-pipeline-normalize-aggregation", @@ -71151,7 +71309,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L662-L667" +======= + "specLocation": "_types/aggregations/bucket.ts#L621-L626" +>>>>>>> 07886ab3f (same as range query) }, { "extDocId": "search-aggregations-metrics-percentile-rank-aggregation", @@ -71467,7 +71629,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L669-L689" +======= + "specLocation": "_types/aggregations/bucket.ts#L628-L648" +>>>>>>> 07886ab3f (same as range query) }, { "extDocId": "search-aggregations-bucket-rare-terms-aggregation", @@ -71570,11 +71736,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L706-L739" ======= "specLocation": "_types/aggregations/bucket.ts#L704-L734" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L692-L722" +>>>>>>> 07886ab3f (same as range query) }, { "inherits": { @@ -71661,11 +71831,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L741-L747" ======= "specLocation": "_types/aggregations/bucket.ts#L736-L742" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L724-L730" +>>>>>>> 07886ab3f (same as range query) }, { "extDocId": "search-aggregations-random-sampler-aggregation", @@ -71738,11 +71912,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L771-L780" ======= "specLocation": "_types/aggregations/bucket.ts#L744-L750" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L732-L738" +>>>>>>> 07886ab3f (same as range query) }, { "inherits": { @@ -72054,11 +72232,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L817-L884" ======= "specLocation": "_types/aggregations/bucket.ts#L787-L851" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L775-L839" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -72092,11 +72274,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L782-L791" ======= "specLocation": "_types/aggregations/bucket.ts#L752-L761" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L740-L749" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "enum", @@ -72118,11 +72304,15 @@ "name": "TermsAggregationExecutionHint", "namespace": "_types.aggregations" }, +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1067-L1072" ======= "specLocation": "_types/aggregations/bucket.ts#L1013-L1018" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L1001-L1006" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -72144,11 +72334,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L793-L798" ======= "specLocation": "_types/aggregations/bucket.ts#L763-L768" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L751-L756" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -72182,11 +72376,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L800-L809" ======= "specLocation": "_types/aggregations/bucket.ts#L770-L779" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L758-L767" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -72195,11 +72393,15 @@ "namespace": "_types.aggregations" }, "properties": [], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L811-L811" ======= "specLocation": "_types/aggregations/bucket.ts#L781-L781" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L769-L769" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -72220,11 +72422,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L813-L815" ======= "specLocation": "_types/aggregations/bucket.ts#L783-L785" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L771-L773" +>>>>>>> 07886ab3f (same as range query) }, { "extDocId": "search-aggregations-bucket-significanttext-aggregation", @@ -72447,11 +72653,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L886-L961" ======= "specLocation": "_types/aggregations/bucket.ts#L853-L925" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L841-L913" +>>>>>>> 07886ab3f (same as range query) }, { "inherits": { @@ -72762,6 +72972,7 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L963-L1031" }, @@ -72810,6 +73021,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L927-L992" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L915-L980" +>>>>>>> 07886ab3f (same as range query) }, { "inherits": { @@ -73437,11 +73651,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1091-L1115" ======= "specLocation": "_types/aggregations/bucket.ts#L1037-L1058" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L1025-L1046" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -84224,7 +84442,26 @@ { "kind": "type_alias", "name": { +<<<<<<< HEAD "name": "EsqlResult", +======= + "name": "DateMath", + "namespace": "_types" + }, + "specLocation": "_types/Time.ts#L42-L42", + "type": { + "kind": "instance_of", + "type": { + "name": "string", + "namespace": "_builtins" + } + } + }, + { + "kind": "type_alias", + "name": { + "name": "EsqlColumns", +>>>>>>> 07886ab3f (same as range query) "namespace": "_types" }, "specLocation": "_types/Binary.ts#L24-L24", @@ -88448,6 +88685,38 @@ ], "specLocation": "_types/analysis/analyzers.ts#L317-L321" }, + { + "codegenNames": [ + "expr", + "value" + ], + "description": "A date range limit, represented either as a DateMath expression or a number expressed\naccording to the target field's precision.", + "kind": "type_alias", + "name": { + "name": "FieldDateMath", + "namespace": "_types.aggregations" + }, + "specLocation": "_types/aggregations/bucket.ts#L683-L690", + "type": { + "items": [ + { + "kind": "instance_of", + "type": { + "name": "DateMath", + "namespace": "_types" + } + }, + { + "kind": "instance_of", + "type": { + "name": "double", + "namespace": "_types" + } + } + ], + "kind": "union_of" + } + }, { "codegenNames": [ "name", diff --git a/output/schema/schema.json b/output/schema/schema.json index a522cd7df9..afdda02bca 100644 --- a/output/schema/schema.json +++ b/output/schema/schema.json @@ -55827,11 +55827,15 @@ "name": "AggregateOrder", "namespace": "_types.aggregations" }, +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1052-L1054", ======= "specLocation": "_types/aggregations/bucket.ts#L998-L1000", >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L986-L988", +>>>>>>> 07886ab3f (same as range query) "type": { "kind": "union_of", "items": [ @@ -57064,15 +57068,16 @@ { "codegenNames": [ "untyped", + "date", "number", - "string" + "term" ], "kind": "type_alias", "name": { "name": "AggregationRange", "namespace": "_types.aggregations" }, - "specLocation": "_types/aggregations/bucket.ts#L674-L681", + "specLocation": "_types/aggregations/bucket.ts#L650-L658", "type": { "items": [ { @@ -57082,6 +57087,13 @@ "namespace": "_types.aggregations" } }, + { + "kind": "instance_of", + "type": { + "name": "DateAggregationRange", + "namespace": "_types.aggregations" + } + }, { "kind": "instance_of", "type": { @@ -57092,7 +57104,7 @@ { "kind": "instance_of", "type": { - "name": "StringAggregationRange", + "name": "TermAggregationRange", "namespace": "_types.aggregations" } } @@ -57200,8 +57212,12 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L683-L696" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L660-L673" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -58494,11 +58510,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1117-L1182" ======= "specLocation": "_types/aggregations/bucket.ts#L1060-L1124" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L1048-L1112" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "type_alias", @@ -58510,11 +58530,15 @@ "name": "CategorizeTextAnalyzer", "namespace": "_types.aggregations" }, +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1184-L1187", ======= "specLocation": "_types/aggregations/bucket.ts#L1126-L1129", >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L1114-L1117", +>>>>>>> 07886ab3f (same as range query) "type": { "kind": "union_of", "items": [ @@ -58567,11 +58591,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L782-L791" ======= "specLocation": "_types/aggregations/bucket.ts#L752-L761" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L740-L749" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -59194,11 +59222,39 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1189-L1193" ======= "specLocation": "_types/aggregations/bucket.ts#L1131-L1135" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L1119-L1123" + }, + { + "inherits": { + "generics": [ + { + "kind": "instance_of", + "type": { + "name": "FieldDateMath", + "namespace": "_types.aggregations" + } + } + ], + "type": { + "name": "AggregationRangeBase", + "namespace": "_types.aggregations" + } + }, + "kind": "interface", + "name": { + "name": "DateAggregationRange", + "namespace": "_types.aggregations" + }, + "properties": [], + "specLocation": "_types/aggregations/bucket.ts#L681-L681" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -59576,7 +59632,7 @@ "value": { "kind": "instance_of", "type": { - "name": "DateRangeExpression", + "name": "DateAggregationRange", "namespace": "_types.aggregations" } } @@ -59610,6 +59666,7 @@ "specLocation": "_types/aggregations/bucket.ts#L281-L307" }, { +<<<<<<< HEAD "kind": "interface", "name": { "name": "DateRangeExpression", @@ -59659,6 +59716,8 @@ "kind": "interface", "extDocId": "search-aggregations-pipeline-derivative-aggregation", "extDocUrl": "https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-pipeline-derivative-aggregation.html", +======= +>>>>>>> 07886ab3f (same as range query) "inherits": { "type": { "name": "SingleMetricAggregateBase", @@ -59789,7 +59848,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L333-L357" +======= + "specLocation": "_types/aggregations/bucket.ts#L298-L319" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -59952,7 +60015,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L508-L517" +======= + "specLocation": "_types/aggregations/bucket.ts#L467-L476" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -60294,7 +60361,11 @@ "name": "FieldDateMath", "namespace": "_types.aggregations" }, +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L309-L316", +======= + "specLocation": "_types/aggregations/bucket.ts#L683-L690", +>>>>>>> 07886ab3f (same as range query) "type": { "kind": "union_of", "items": [ @@ -60436,7 +60507,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L374-L394" +======= + "specLocation": "_types/aggregations/bucket.ts#L336-L356" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -60611,11 +60686,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1240-L1267" ======= "specLocation": "_types/aggregations/bucket.ts#L1182-L1206" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L1170-L1194" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -60715,11 +60794,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1226-L1238" ======= "specLocation": "_types/aggregations/bucket.ts#L1168-L1180" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L1156-L1168" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "enum", @@ -60981,7 +61064,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L396-L419" +======= + "specLocation": "_types/aggregations/bucket.ts#L358-L381" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -61086,7 +61173,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L421-L449" +======= + "specLocation": "_types/aggregations/bucket.ts#L383-L408" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -61440,7 +61531,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L451-L477" +======= + "specLocation": "_types/aggregations/bucket.ts#L410-L436" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -61548,7 +61643,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L479-L504" +======= + "specLocation": "_types/aggregations/bucket.ts#L438-L463" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -61584,7 +61683,11 @@ "namespace": "_types.aggregations" }, "properties": [], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L506-L506" +======= + "specLocation": "_types/aggregations/bucket.ts#L465-L465" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -61606,11 +61709,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L793-L798" ======= "specLocation": "_types/aggregations/bucket.ts#L763-L768" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L751-L756" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -61856,7 +61963,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L519-L565" +======= + "specLocation": "_types/aggregations/bucket.ts#L478-L524" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -62505,11 +62616,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1195-L1224" ======= "specLocation": "_types/aggregations/bucket.ts#L1137-L1166" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L1125-L1154" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -62642,7 +62757,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L567-L576" +======= + "specLocation": "_types/aggregations/bucket.ts#L526-L535" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -62712,7 +62831,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L578-L591" +======= + "specLocation": "_types/aggregations/bucket.ts#L537-L550" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -63543,7 +63666,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L593-L599" +======= + "specLocation": "_types/aggregations/bucket.ts#L552-L558" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "enum", @@ -63901,7 +64028,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L643-L653" +======= + "specLocation": "_types/aggregations/bucket.ts#L602-L612" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -64048,7 +64179,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L601-L641" +======= + "specLocation": "_types/aggregations/bucket.ts#L560-L600" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -64137,11 +64272,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L800-L809" ======= "specLocation": "_types/aggregations/bucket.ts#L770-L779" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L758-L767" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -64190,7 +64329,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L655-L660" +======= + "specLocation": "_types/aggregations/bucket.ts#L614-L619" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -64282,7 +64425,7 @@ "namespace": "_types.aggregations" }, "properties": [], - "specLocation": "_types/aggregations/bucket.ts#L698-L698" + "specLocation": "_types/aggregations/bucket.ts#L675-L675" }, { >>>>>>> 9fd43f8ed (making range aggregation untagged union) @@ -64331,7 +64474,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L662-L667" +======= + "specLocation": "_types/aggregations/bucket.ts#L621-L626" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -64340,11 +64487,15 @@ "namespace": "_types.aggregations" }, "properties": [], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L811-L811" ======= "specLocation": "_types/aggregations/bucket.ts#L781-L781" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L769-L769" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -64822,7 +64973,11 @@ } } ], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L669-L689" +======= + "specLocation": "_types/aggregations/bucket.ts#L628-L648" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -65000,11 +65155,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L706-L739" ======= "specLocation": "_types/aggregations/bucket.ts#L704-L734" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L692-L722" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -65153,11 +65312,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L741-L747" ======= "specLocation": "_types/aggregations/bucket.ts#L736-L742" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L724-L730" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -65207,11 +65370,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L771-L780" ======= "specLocation": "_types/aggregations/bucket.ts#L744-L750" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L732-L738" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "enum", @@ -65233,7 +65400,11 @@ "name": "SamplerAggregationExecutionHint", "namespace": "_types.aggregations" }, +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L359-L372" +======= + "specLocation": "_types/aggregations/bucket.ts#L321-L334" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -65254,11 +65425,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L813-L815" ======= "specLocation": "_types/aggregations/bucket.ts#L783-L785" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L771-L773" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -65772,11 +65947,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L817-L884" ======= "specLocation": "_types/aggregations/bucket.ts#L787-L851" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L775-L839" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -66040,11 +66219,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L886-L961" ======= "specLocation": "_types/aggregations/bucket.ts#L853-L925" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L841-L913" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -66635,6 +66818,7 @@ "specLocation": "_types/aggregations/pipeline.ts#L410-L410" }, { +<<<<<<< HEAD <<<<<<< HEAD "kind": "interface", ======= @@ -66663,6 +66847,8 @@ }, { >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= +>>>>>>> 07886ab3f (same as range query) "description": "Result of the `rare_terms` aggregation when the field is a string.", "inherits": { "generics": [ @@ -67223,7 +67409,34 @@ "specLocation": "_types/aggregations/metric.ts#L331-L344" }, { +<<<<<<< HEAD "kind": "interface", +======= + "inherits": { + "generics": [ + { + "kind": "instance_of", + "type": { + "name": "string", + "namespace": "_builtins" + } + } + ], + "type": { + "name": "AggregationRangeBase", + "namespace": "_types.aggregations" + } + }, + "kind": "interface", + "name": { + "name": "TermAggregationRange", + "namespace": "_types.aggregations" + }, + "properties": [], + "specLocation": "_types/aggregations/bucket.ts#L677-L677" + }, + { +>>>>>>> 07886ab3f (same as range query) "generics": [ { "name": "TBucket", @@ -67493,11 +67706,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L963-L1031" ======= "specLocation": "_types/aggregations/bucket.ts#L927-L992" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L915-L980" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "enum", @@ -67515,11 +67732,15 @@ "name": "TermsAggregationCollectMode", "namespace": "_types.aggregations" }, +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1056-L1065" ======= "specLocation": "_types/aggregations/bucket.ts#L1002-L1011" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L990-L999" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "enum", @@ -67541,11 +67762,15 @@ "name": "TermsAggregationExecutionHint", "namespace": "_types.aggregations" }, +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1067-L1072" ======= "specLocation": "_types/aggregations/bucket.ts#L1013-L1018" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L1001-L1006" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -67587,11 +67812,15 @@ "name": "TermsExclude", "namespace": "_types.aggregations" }, +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1077-L1078", ======= "specLocation": "_types/aggregations/bucket.ts#L1023-L1024", >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L1011-L1012", +>>>>>>> 07886ab3f (same as range query) "type": { "kind": "union_of", "items": [ @@ -67626,11 +67855,15 @@ "name": "TermsInclude", "namespace": "_types.aggregations" }, +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1074-L1075", ======= "specLocation": "_types/aggregations/bucket.ts#L1020-L1021", >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L1008-L1009", +>>>>>>> 07886ab3f (same as range query) "type": { "kind": "union_of", "items": [ @@ -67693,11 +67926,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1080-L1089" ======= "specLocation": "_types/aggregations/bucket.ts#L1026-L1035" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L1014-L1023" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", @@ -68393,7 +68630,7 @@ "namespace": "_types.aggregations" }, "properties": [], - "specLocation": "_types/aggregations/bucket.ts#L702-L702" + "specLocation": "_types/aggregations/bucket.ts#L679-L679" }, { >>>>>>> 9fd43f8ed (making range aggregation untagged union) @@ -68564,11 +68801,15 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1091-L1115" ======= "specLocation": "_types/aggregations/bucket.ts#L1037-L1058" >>>>>>> 9fd43f8ed (making range aggregation untagged union) +======= + "specLocation": "_types/aggregations/bucket.ts#L1025-L1046" +>>>>>>> 07886ab3f (same as range query) }, { "kind": "interface", diff --git a/output/typescript/types.ts b/output/typescript/types.ts index 056f39fb0c..be044a19a0 100644 --- a/output/typescript/types.ts +++ b/output/typescript/types.ts @@ -3174,6 +3174,7 @@ export interface AggregationsAggregationContainer { variable_width_histogram?: AggregationsVariableWidthHistogramAggregation } +<<<<<<< HEAD <<<<<<< HEAD export interface AggregationsAggregationRange { from?: double | null @@ -3181,6 +3182,9 @@ export interface AggregationsAggregationRange { to?: double | null ======= export type AggregationsAggregationRange = AggregationsUntypedAggregationRange | AggregationsNumberAggregationRange | AggregationsStringAggregationRange +======= +export type AggregationsAggregationRange = AggregationsUntypedAggregationRange | AggregationsDateAggregationRange | AggregationsNumberAggregationRange | AggregationsTermAggregationRange +>>>>>>> 07886ab3f (same as range query) export interface AggregationsAggregationRangeBase { from?: T @@ -3409,6 +3413,9 @@ export interface AggregationsCustomCategorizeTextAnalyzer { filter?: string[] } +export interface AggregationsDateAggregationRange extends AggregationsAggregationRangeBase { +} + export interface AggregationsDateHistogramAggregate extends AggregationsMultiBucketAggregateBase { } @@ -3444,17 +3451,11 @@ export interface AggregationsDateRangeAggregation extends AggregationsBucketAggr field?: Field format?: string missing?: AggregationsMissing - ranges?: AggregationsDateRangeExpression[] + ranges?: AggregationsDateAggregationRange[] time_zone?: TimeZone keyed?: boolean } -export interface AggregationsDateRangeExpression { - from?: AggregationsFieldDateMath - key?: string - to?: AggregationsFieldDateMath -} - export interface AggregationsDerivativeAggregate extends AggregationsSingleMetricAggregateBase { normalized_value?: double normalized_value_as_string?: string @@ -4267,9 +4268,6 @@ export interface AggregationsStatsBucketAggregate extends AggregationsStatsAggre export interface AggregationsStatsBucketAggregation extends AggregationsPipelineAggregationBase { } -export interface AggregationsStringAggregationRange extends AggregationsAggregationRangeBase { -} - export interface AggregationsStringRareTermsAggregate extends AggregationsMultiBucketAggregateBase { } @@ -4336,6 +4334,9 @@ export interface AggregationsTTestAggregation { export type AggregationsTTestType = 'paired' | 'homoscedastic' | 'heteroscedastic' +export interface AggregationsTermAggregationRange extends AggregationsAggregationRangeBase { +} + export interface AggregationsTermsAggregateBase extends AggregationsMultiBucketAggregateBase { doc_count_error_upper_bound?: long sum_other_doc_count?: long diff --git a/specification/_types/aggregations/bucket.ts b/specification/_types/aggregations/bucket.ts index b4e23c020d..28ea96b3bc 100644 --- a/specification/_types/aggregations/bucket.ts +++ b/specification/_types/aggregations/bucket.ts @@ -295,7 +295,7 @@ export class DateRangeAggregation extends BucketAggregationBase { /** * Array of date ranges. */ - ranges?: DateRangeExpression[] + ranges?: DateAggregationRange[] /** * Time zone used to convert dates from another time zone to UTC. */ @@ -306,33 +306,6 @@ export class DateRangeAggregation extends BucketAggregationBase { keyed?: boolean } -/** - * A date range limit, represented either as a DateMath expression or a number expressed - * according to the target field's precision. - * - * @codegen_names expr, value - */ -// ES: DateRangeAggregationBuilder.innerBuild() -export type FieldDateMath = DateMath | double - -export class DateRangeExpression { - /** - * Start of the range (inclusive). - */ - from?: FieldDateMath - /** - * Custom key to return the range with. - */ - key?: string - /** - * End of the range (exclusive). - */ - to?: FieldDateMath -} - -/** - * @ext_doc_id search-aggregations-bucket-diversified-sampler-aggregation - */ export class DiversifiedSamplerAggregation extends BucketAggregationBase { /** * The type of value used for de-duplication. @@ -689,13 +662,14 @@ export class RangeAggregation extends BucketAggregationBase { } /** - * @codegen_names untyped, number, string + * @codegen_names untyped, date, number, term * @variants untagged untyped=_types.aggregations.UntypedAggregationRange */ export type AggregationRange = | UntypedAggregationRange + | DateAggregationRange | NumberAggregationRange - | StringAggregationRange + | TermAggregationRange export class AggregationRangeBase { /** @@ -714,10 +688,21 @@ export class AggregationRangeBase { export class NumberAggregationRange extends AggregationRangeBase {} -export class StringAggregationRange extends AggregationRangeBase {} +export class TermAggregationRange extends AggregationRangeBase {} export class UntypedAggregationRange extends AggregationRangeBase {} +export class DateAggregationRange extends AggregationRangeBase {} + +/** + * A date range limit, represented either as a DateMath expression or a number expressed + * according to the target field's precision. + * + * @codegen_names expr, value + */ +// ES: DateRangeAggregationBuilder.innerBuild() +export type FieldDateMath = DateMath | double + export class RareTermsAggregation extends BucketAggregationBase { /** * Terms that should be excluded from the aggregation. From 0ab26b200814f9b063a6869dbdc35184586bc545 Mon Sep 17 00:00:00 2001 From: Laura Trotta Date: Thu, 18 Jul 2024 16:41:38 +0200 Subject: [PATCH 3/5] removed term range aggregation --- output/openapi/elasticsearch-openapi.json | 30 ----- .../elasticsearch-serverless-openapi.json | 30 ----- output/schema/schema-serverless.json | 124 +++++++++++++++-- output/schema/schema.json | 127 ++++++++++++++++-- output/typescript/types.ts | 7 +- specification/_types/aggregations/bucket.ts | 6 +- 6 files changed, 232 insertions(+), 92 deletions(-) diff --git a/output/openapi/elasticsearch-openapi.json b/output/openapi/elasticsearch-openapi.json index e4e4284534..e755ec9878 100644 --- a/output/openapi/elasticsearch-openapi.json +++ b/output/openapi/elasticsearch-openapi.json @@ -55033,9 +55033,6 @@ }, { "$ref": "#/components/schemas/_types.aggregations:NumberAggregationRange" - }, - { - "$ref": "#/components/schemas/_types.aggregations:TermAggregationRange" } ] }, @@ -55109,33 +55106,6 @@ } } }, - "_types.aggregations:TermAggregationRange": { - "allOf": [ - { - "$ref": "#/components/schemas/_types.aggregations:AggregationRangeBasestring" - }, - { - "type": "object" - } - ] - }, - "_types.aggregations:AggregationRangeBasestring": { - "type": "object", - "properties": { - "from": { - "description": "Start of the range (inclusive).", - "type": "string" - }, - "key": { - "description": "Custom key to return the range with.", - "type": "string" - }, - "to": { - "description": "End of the range (exclusive).", - "type": "string" - } - } - }, "_types.aggregations:GeoHashGridAggregation": { "allOf": [ { diff --git a/output/openapi/elasticsearch-serverless-openapi.json b/output/openapi/elasticsearch-serverless-openapi.json index 761fe11524..3404fff37a 100644 --- a/output/openapi/elasticsearch-serverless-openapi.json +++ b/output/openapi/elasticsearch-serverless-openapi.json @@ -34172,9 +34172,6 @@ }, { "$ref": "#/components/schemas/_types.aggregations:NumberAggregationRange" - }, - { - "$ref": "#/components/schemas/_types.aggregations:TermAggregationRange" } ] }, @@ -34248,33 +34245,6 @@ } } }, - "_types.aggregations:TermAggregationRange": { - "allOf": [ - { - "$ref": "#/components/schemas/_types.aggregations:AggregationRangeBasestring" - }, - { - "type": "object" - } - ] - }, - "_types.aggregations:AggregationRangeBasestring": { - "type": "object", - "properties": { - "from": { - "description": "Start of the range (inclusive).", - "type": "string" - }, - "key": { - "description": "Custom key to return the range with.", - "type": "string" - }, - "to": { - "description": "End of the range (exclusive).", - "type": "string" - } - } - }, "_types.aggregations:GeoHashGridAggregation": { "allOf": [ { diff --git a/output/schema/schema-serverless.json b/output/schema/schema-serverless.json index 81e37c1644..1f1377c539 100644 --- a/output/schema/schema-serverless.json +++ b/output/schema/schema-serverless.json @@ -67008,6 +67008,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1117-L1182" ======= @@ -67016,6 +67017,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1048-L1112" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L1044-L1108" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "codegenNames": [ @@ -67028,6 +67032,7 @@ "namespace": "_types.aggregations" }, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1184-L1187", ======= @@ -67036,6 +67041,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1114-L1117", >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L1110-L1113", +>>>>>>> 1f832eff5 (removed term range aggregation) "type": { "items": [ { @@ -67104,6 +67112,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1189-L1193" ======= @@ -67112,6 +67121,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1119-L1123" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L1115-L1119" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "inherits": { @@ -67996,6 +68008,7 @@ "namespace": "_types.aggregations" }, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1052-L1054", ======= @@ -68004,6 +68017,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L986-L988", >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L982-L984", +>>>>>>> 1f832eff5 (removed term range aggregation) "type": { "items": [ { @@ -68162,7 +68178,7 @@ "namespace": "_types.aggregations" }, "properties": [], - "specLocation": "_types/aggregations/bucket.ts#L681-L681" + "specLocation": "_types/aggregations/bucket.ts#L677-L677" }, { "generics": [ @@ -68214,6 +68230,7 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L318-L331" }, @@ -68266,6 +68283,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L660-L673" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L658-L671" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "inherits": { @@ -68525,6 +68545,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1240-L1267" ======= @@ -68533,6 +68554,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1170-L1194" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L1166-L1190" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "interface", @@ -68578,6 +68602,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1226-L1238" ======= @@ -68586,6 +68611,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1156-L1168" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L1152-L1164" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "codegenNames": [ @@ -68598,6 +68626,7 @@ "namespace": "_types.aggregations" }, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1077-L1078", ======= @@ -68606,6 +68635,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1011-L1012", >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L1007-L1008", +>>>>>>> 1f832eff5 (removed term range aggregation) "type": { "items": [ { @@ -68641,6 +68673,7 @@ "namespace": "_types.aggregations" }, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1074-L1075", ======= @@ -68649,6 +68682,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1008-L1009", >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L1004-L1005", +>>>>>>> 1f832eff5 (removed term range aggregation) "type": { "items": [ { @@ -68712,6 +68748,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1080-L1089" ======= @@ -68720,6 +68757,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1014-L1023" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L1010-L1019" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "inherits": { @@ -69010,15 +69050,14 @@ "codegenNames": [ "untyped", "date", - "number", - "term" + "number" ], "kind": "type_alias", "name": { "name": "AggregationRange", "namespace": "_types.aggregations" }, - "specLocation": "_types/aggregations/bucket.ts#L650-L658", + "specLocation": "_types/aggregations/bucket.ts#L650-L657", "type": { "items": [ { @@ -69041,13 +69080,6 @@ "name": "NumberAggregationRange", "namespace": "_types.aggregations" } - }, - { - "kind": "instance_of", - "type": { - "name": "TermAggregationRange", - "namespace": "_types.aggregations" - } } ], "kind": "union_of" @@ -69078,6 +69110,7 @@ "namespace": "_types.aggregations" }, "properties": [], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L702-L702" }, @@ -69178,6 +69211,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L679-L679" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L675-L675" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "inherits": { @@ -69201,6 +69237,7 @@ "namespace": "_types.aggregations" }, "properties": [], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L675-L675" }, { @@ -69231,6 +69268,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L677-L677" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L673-L673" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "extDocId": "search-aggregations-bucket-geohashgrid-aggregation", @@ -70042,6 +70082,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1195-L1224" ======= @@ -70050,6 +70091,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1125-L1154" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L1121-L1150" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "inherits": { @@ -71139,6 +71183,7 @@ "namespace": "_types.aggregations" }, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1056-L1065" ======= @@ -71147,6 +71192,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L990-L999" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L986-L995" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "interface", @@ -71737,6 +71785,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L706-L739" ======= @@ -71745,6 +71794,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L692-L722" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L688-L718" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "inherits": { @@ -71832,6 +71884,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L741-L747" ======= @@ -71840,6 +71893,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L724-L730" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L720-L726" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "extDocId": "search-aggregations-random-sampler-aggregation", @@ -71913,6 +71969,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L771-L780" ======= @@ -71921,6 +71978,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L732-L738" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L728-L734" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "inherits": { @@ -72233,6 +72293,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L817-L884" ======= @@ -72241,6 +72302,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L775-L839" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L771-L835" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "interface", @@ -72275,6 +72339,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L782-L791" ======= @@ -72283,6 +72348,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L740-L749" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L736-L745" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "enum", @@ -72305,6 +72373,7 @@ "namespace": "_types.aggregations" }, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1067-L1072" ======= @@ -72313,6 +72382,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1001-L1006" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L997-L1002" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "interface", @@ -72335,6 +72407,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L793-L798" ======= @@ -72343,6 +72416,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L751-L756" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L747-L752" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "interface", @@ -72377,6 +72453,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L800-L809" ======= @@ -72385,6 +72462,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L758-L767" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L754-L763" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "interface", @@ -72394,6 +72474,7 @@ }, "properties": [], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L811-L811" ======= @@ -72402,6 +72483,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L769-L769" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L765-L765" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "interface", @@ -72423,6 +72507,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L813-L815" ======= @@ -72431,6 +72516,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L771-L773" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L767-L769" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "extDocId": "search-aggregations-bucket-significanttext-aggregation", @@ -72654,6 +72742,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L886-L961" ======= @@ -72662,6 +72751,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L841-L913" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L837-L909" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "inherits": { @@ -72973,6 +73065,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L963-L1031" }, @@ -73024,6 +73117,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L915-L980" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L911-L976" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "inherits": { @@ -73652,6 +73748,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1091-L1115" ======= @@ -73660,6 +73757,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1025-L1046" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L1021-L1042" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "interface", @@ -88696,7 +88796,7 @@ "name": "FieldDateMath", "namespace": "_types.aggregations" }, - "specLocation": "_types/aggregations/bucket.ts#L683-L690", + "specLocation": "_types/aggregations/bucket.ts#L679-L686", "type": { "items": [ { diff --git a/output/schema/schema.json b/output/schema/schema.json index afdda02bca..f21add04f2 100644 --- a/output/schema/schema.json +++ b/output/schema/schema.json @@ -55828,6 +55828,7 @@ "namespace": "_types.aggregations" }, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1052-L1054", ======= @@ -55836,6 +55837,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L986-L988", >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L982-L984", +>>>>>>> 1f832eff5 (removed term range aggregation) "type": { "kind": "union_of", "items": [ @@ -57069,15 +57073,14 @@ "codegenNames": [ "untyped", "date", - "number", - "term" + "number" ], "kind": "type_alias", "name": { "name": "AggregationRange", "namespace": "_types.aggregations" }, - "specLocation": "_types/aggregations/bucket.ts#L650-L658", + "specLocation": "_types/aggregations/bucket.ts#L650-L657", "type": { "items": [ { @@ -57100,13 +57103,6 @@ "name": "NumberAggregationRange", "namespace": "_types.aggregations" } - }, - { - "kind": "instance_of", - "type": { - "name": "TermAggregationRange", - "namespace": "_types.aggregations" - } } ], "kind": "union_of" @@ -57212,12 +57208,16 @@ } } ], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L683-L696" >>>>>>> 9fd43f8ed (making range aggregation untagged union) ======= "specLocation": "_types/aggregations/bucket.ts#L660-L673" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L658-L671" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "interface", @@ -58511,6 +58511,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1117-L1182" ======= @@ -58519,6 +58520,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1048-L1112" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L1044-L1108" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "type_alias", @@ -58531,6 +58535,7 @@ "namespace": "_types.aggregations" }, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1184-L1187", ======= @@ -58539,6 +58544,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1114-L1117", >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L1110-L1113", +>>>>>>> 1f832eff5 (removed term range aggregation) "type": { "kind": "union_of", "items": [ @@ -58592,6 +58600,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L782-L791" ======= @@ -58600,6 +58609,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L740-L749" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L736-L745" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "interface", @@ -59223,6 +59235,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1189-L1193" ======= @@ -59230,6 +59243,9 @@ >>>>>>> 9fd43f8ed (making range aggregation untagged union) ======= "specLocation": "_types/aggregations/bucket.ts#L1119-L1123" +======= + "specLocation": "_types/aggregations/bucket.ts#L1115-L1119" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "inherits": { @@ -59253,8 +59269,12 @@ "namespace": "_types.aggregations" }, "properties": [], +<<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L681-L681" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L677-L677" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "interface", @@ -60361,11 +60381,15 @@ "name": "FieldDateMath", "namespace": "_types.aggregations" }, +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L309-L316", ======= "specLocation": "_types/aggregations/bucket.ts#L683-L690", >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L679-L686", +>>>>>>> 1f832eff5 (removed term range aggregation) "type": { "kind": "union_of", "items": [ @@ -60687,6 +60711,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1240-L1267" ======= @@ -60695,6 +60720,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1170-L1194" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L1166-L1190" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "interface", @@ -60795,6 +60823,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1226-L1238" ======= @@ -60803,6 +60832,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1156-L1168" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L1152-L1164" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "enum", @@ -61710,6 +61742,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L793-L798" ======= @@ -61718,6 +61751,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L751-L756" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L747-L752" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "interface", @@ -62617,6 +62653,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1195-L1224" ======= @@ -62625,6 +62662,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1125-L1154" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L1121-L1150" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "interface", @@ -64273,6 +64313,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L800-L809" ======= @@ -64281,6 +64322,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L758-L767" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L754-L763" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "interface", @@ -64425,7 +64469,7 @@ "namespace": "_types.aggregations" }, "properties": [], - "specLocation": "_types/aggregations/bucket.ts#L675-L675" + "specLocation": "_types/aggregations/bucket.ts#L673-L673" }, { >>>>>>> 9fd43f8ed (making range aggregation untagged union) @@ -64488,6 +64532,7 @@ }, "properties": [], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L811-L811" ======= @@ -64496,6 +64541,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L769-L769" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L765-L765" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "interface", @@ -65156,6 +65204,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L706-L739" ======= @@ -65164,6 +65213,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L692-L722" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L688-L718" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "interface", @@ -65313,6 +65365,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L741-L747" ======= @@ -65321,6 +65374,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L724-L730" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L720-L726" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "interface", @@ -65371,6 +65427,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L771-L780" ======= @@ -65379,6 +65436,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L732-L738" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L728-L734" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "enum", @@ -65426,6 +65486,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L813-L815" ======= @@ -65434,6 +65495,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L771-L773" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L767-L769" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "interface", @@ -65948,6 +66012,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L817-L884" ======= @@ -65956,6 +66021,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L775-L839" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L771-L835" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "interface", @@ -66220,6 +66288,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L886-L961" ======= @@ -66228,6 +66297,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L841-L913" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L837-L909" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "interface", @@ -67409,6 +67481,7 @@ "specLocation": "_types/aggregations/metric.ts#L331-L344" }, { +<<<<<<< HEAD <<<<<<< HEAD "kind": "interface", ======= @@ -67437,6 +67510,8 @@ }, { >>>>>>> 07886ab3f (same as range query) +======= +>>>>>>> 1f832eff5 (removed term range aggregation) "generics": [ { "name": "TBucket", @@ -67707,6 +67782,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L963-L1031" ======= @@ -67715,6 +67791,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L915-L980" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L911-L976" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "enum", @@ -67733,6 +67812,7 @@ "namespace": "_types.aggregations" }, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1056-L1065" ======= @@ -67741,6 +67821,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L990-L999" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L986-L995" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "enum", @@ -67763,6 +67846,7 @@ "namespace": "_types.aggregations" }, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1067-L1072" ======= @@ -67771,6 +67855,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1001-L1006" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L997-L1002" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "interface", @@ -67813,6 +67900,7 @@ "namespace": "_types.aggregations" }, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1077-L1078", ======= @@ -67821,6 +67909,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1011-L1012", >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L1007-L1008", +>>>>>>> 1f832eff5 (removed term range aggregation) "type": { "kind": "union_of", "items": [ @@ -67856,6 +67947,7 @@ "namespace": "_types.aggregations" }, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1074-L1075", ======= @@ -67864,6 +67956,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1008-L1009", >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L1004-L1005", +>>>>>>> 1f832eff5 (removed term range aggregation) "type": { "kind": "union_of", "items": [ @@ -67927,6 +68022,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1080-L1089" ======= @@ -67935,6 +68031,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1014-L1023" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L1010-L1019" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "interface", @@ -68630,7 +68729,7 @@ "namespace": "_types.aggregations" }, "properties": [], - "specLocation": "_types/aggregations/bucket.ts#L679-L679" + "specLocation": "_types/aggregations/bucket.ts#L675-L675" }, { >>>>>>> 9fd43f8ed (making range aggregation untagged union) @@ -68802,6 +68901,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1091-L1115" ======= @@ -68810,6 +68910,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1025-L1046" >>>>>>> 07886ab3f (same as range query) +======= + "specLocation": "_types/aggregations/bucket.ts#L1021-L1042" +>>>>>>> 1f832eff5 (removed term range aggregation) }, { "kind": "interface", diff --git a/output/typescript/types.ts b/output/typescript/types.ts index be044a19a0..4d9ec6cd10 100644 --- a/output/typescript/types.ts +++ b/output/typescript/types.ts @@ -3174,6 +3174,7 @@ export interface AggregationsAggregationContainer { variable_width_histogram?: AggregationsVariableWidthHistogramAggregation } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD export interface AggregationsAggregationRange { @@ -3185,6 +3186,9 @@ export type AggregationsAggregationRange = AggregationsUntypedAggregationRange | ======= export type AggregationsAggregationRange = AggregationsUntypedAggregationRange | AggregationsDateAggregationRange | AggregationsNumberAggregationRange | AggregationsTermAggregationRange >>>>>>> 07886ab3f (same as range query) +======= +export type AggregationsAggregationRange = AggregationsUntypedAggregationRange | AggregationsDateAggregationRange | AggregationsNumberAggregationRange +>>>>>>> 1f832eff5 (removed term range aggregation) export interface AggregationsAggregationRangeBase { from?: T @@ -4334,9 +4338,6 @@ export interface AggregationsTTestAggregation { export type AggregationsTTestType = 'paired' | 'homoscedastic' | 'heteroscedastic' -export interface AggregationsTermAggregationRange extends AggregationsAggregationRangeBase { -} - export interface AggregationsTermsAggregateBase extends AggregationsMultiBucketAggregateBase { doc_count_error_upper_bound?: long sum_other_doc_count?: long diff --git a/specification/_types/aggregations/bucket.ts b/specification/_types/aggregations/bucket.ts index 28ea96b3bc..8382e40849 100644 --- a/specification/_types/aggregations/bucket.ts +++ b/specification/_types/aggregations/bucket.ts @@ -662,15 +662,13 @@ export class RangeAggregation extends BucketAggregationBase { } /** - * @codegen_names untyped, date, number, term + * @codegen_names untyped, date, number * @variants untagged untyped=_types.aggregations.UntypedAggregationRange */ export type AggregationRange = | UntypedAggregationRange | DateAggregationRange | NumberAggregationRange - | TermAggregationRange - export class AggregationRangeBase { /** * Start of the range (inclusive). @@ -688,8 +686,6 @@ export class AggregationRangeBase { export class NumberAggregationRange extends AggregationRangeBase {} -export class TermAggregationRange extends AggregationRangeBase {} - export class UntypedAggregationRange extends AggregationRangeBase {} export class DateAggregationRange extends AggregationRangeBase {} From c94115d3bc420d11fe00df33cb6be4acc6431cdf Mon Sep 17 00:00:00 2001 From: Laura Trotta Date: Thu, 18 Jul 2024 16:50:05 +0200 Subject: [PATCH 4/5] Revert "removed term range aggregation" This reverts commit 1f832eff515668b607e0d3e4c97cbce48439c11a. --- output/openapi/elasticsearch-openapi.json | 30 ++++ .../elasticsearch-serverless-openapi.json | 30 ++++ output/schema/schema-serverless.json | 148 +++++++++++++++++- output/schema/schema.json | 130 ++++++++++++++- output/typescript/types.ts | 7 + specification/_types/aggregations/bucket.ts | 6 +- 6 files changed, 342 insertions(+), 9 deletions(-) diff --git a/output/openapi/elasticsearch-openapi.json b/output/openapi/elasticsearch-openapi.json index e755ec9878..e4e4284534 100644 --- a/output/openapi/elasticsearch-openapi.json +++ b/output/openapi/elasticsearch-openapi.json @@ -55033,6 +55033,9 @@ }, { "$ref": "#/components/schemas/_types.aggregations:NumberAggregationRange" + }, + { + "$ref": "#/components/schemas/_types.aggregations:TermAggregationRange" } ] }, @@ -55106,6 +55109,33 @@ } } }, + "_types.aggregations:TermAggregationRange": { + "allOf": [ + { + "$ref": "#/components/schemas/_types.aggregations:AggregationRangeBasestring" + }, + { + "type": "object" + } + ] + }, + "_types.aggregations:AggregationRangeBasestring": { + "type": "object", + "properties": { + "from": { + "description": "Start of the range (inclusive).", + "type": "string" + }, + "key": { + "description": "Custom key to return the range with.", + "type": "string" + }, + "to": { + "description": "End of the range (exclusive).", + "type": "string" + } + } + }, "_types.aggregations:GeoHashGridAggregation": { "allOf": [ { diff --git a/output/openapi/elasticsearch-serverless-openapi.json b/output/openapi/elasticsearch-serverless-openapi.json index 3404fff37a..761fe11524 100644 --- a/output/openapi/elasticsearch-serverless-openapi.json +++ b/output/openapi/elasticsearch-serverless-openapi.json @@ -34172,6 +34172,9 @@ }, { "$ref": "#/components/schemas/_types.aggregations:NumberAggregationRange" + }, + { + "$ref": "#/components/schemas/_types.aggregations:TermAggregationRange" } ] }, @@ -34245,6 +34248,33 @@ } } }, + "_types.aggregations:TermAggregationRange": { + "allOf": [ + { + "$ref": "#/components/schemas/_types.aggregations:AggregationRangeBasestring" + }, + { + "type": "object" + } + ] + }, + "_types.aggregations:AggregationRangeBasestring": { + "type": "object", + "properties": { + "from": { + "description": "Start of the range (inclusive).", + "type": "string" + }, + "key": { + "description": "Custom key to return the range with.", + "type": "string" + }, + "to": { + "description": "End of the range (exclusive).", + "type": "string" + } + } + }, "_types.aggregations:GeoHashGridAggregation": { "allOf": [ { diff --git a/output/schema/schema-serverless.json b/output/schema/schema-serverless.json index 1f1377c539..bd18dcfd52 100644 --- a/output/schema/schema-serverless.json +++ b/output/schema/schema-serverless.json @@ -67009,6 +67009,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1117-L1182" ======= @@ -67020,6 +67021,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1044-L1108" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L1048-L1112" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "codegenNames": [ @@ -67033,6 +67037,7 @@ }, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1184-L1187", ======= @@ -67044,6 +67049,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1110-L1113", >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L1114-L1117", +>>>>>>> 985e70b37 (Revert "removed term range aggregation") "type": { "items": [ { @@ -67113,6 +67121,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1189-L1193" ======= @@ -67124,6 +67133,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1115-L1119" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L1119-L1123" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "inherits": { @@ -68009,6 +68021,7 @@ }, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1052-L1054", ======= @@ -68020,6 +68033,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L982-L984", >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L986-L988", +>>>>>>> 985e70b37 (Revert "removed term range aggregation") "type": { "items": [ { @@ -68178,7 +68194,7 @@ "namespace": "_types.aggregations" }, "properties": [], - "specLocation": "_types/aggregations/bucket.ts#L677-L677" + "specLocation": "_types/aggregations/bucket.ts#L681-L681" }, { "generics": [ @@ -68231,6 +68247,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L318-L331" }, @@ -68286,6 +68303,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L658-L671" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L660-L673" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "inherits": { @@ -68546,6 +68566,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1240-L1267" ======= @@ -68557,6 +68578,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1166-L1190" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L1170-L1194" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "interface", @@ -68603,6 +68627,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1226-L1238" ======= @@ -68614,6 +68639,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1152-L1164" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L1156-L1168" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "codegenNames": [ @@ -68627,6 +68655,7 @@ }, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1077-L1078", ======= @@ -68638,6 +68667,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1007-L1008", >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L1011-L1012", +>>>>>>> 985e70b37 (Revert "removed term range aggregation") "type": { "items": [ { @@ -68674,6 +68706,7 @@ }, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1074-L1075", ======= @@ -68685,6 +68718,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1004-L1005", >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L1008-L1009", +>>>>>>> 985e70b37 (Revert "removed term range aggregation") "type": { "items": [ { @@ -68749,6 +68785,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1080-L1089" ======= @@ -68760,6 +68797,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1010-L1019" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L1014-L1023" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "inherits": { @@ -69050,14 +69090,15 @@ "codegenNames": [ "untyped", "date", - "number" + "number", + "term" ], "kind": "type_alias", "name": { "name": "AggregationRange", "namespace": "_types.aggregations" }, - "specLocation": "_types/aggregations/bucket.ts#L650-L657", + "specLocation": "_types/aggregations/bucket.ts#L650-L658", "type": { "items": [ { @@ -69080,6 +69121,13 @@ "name": "NumberAggregationRange", "namespace": "_types.aggregations" } + }, + { + "kind": "instance_of", + "type": { + "name": "TermAggregationRange", + "namespace": "_types.aggregations" + } } ], "kind": "union_of" @@ -69111,6 +69159,7 @@ }, "properties": [], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L702-L702" }, @@ -69214,6 +69263,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L675-L675" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L679-L679" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "inherits": { @@ -69237,8 +69289,36 @@ "namespace": "_types.aggregations" }, "properties": [], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L675-L675" +======= + "specLocation": "_types/aggregations/bucket.ts#L675-L675" + }, + { + "inherits": { + "generics": [ + { + "kind": "instance_of", + "type": { + "name": "string", + "namespace": "_builtins" + } + } + ], + "type": { + "name": "AggregationRangeBase", + "namespace": "_types.aggregations" + } + }, + "kind": "interface", + "name": { + "name": "TermAggregationRange", + "namespace": "_types.aggregations" + }, + "properties": [], + "specLocation": "_types/aggregations/bucket.ts#L677-L677" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "inherits": { @@ -70083,6 +70163,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1195-L1224" ======= @@ -70094,6 +70175,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1121-L1150" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L1125-L1154" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "inherits": { @@ -71184,6 +71268,7 @@ }, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1056-L1065" ======= @@ -71195,6 +71280,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L986-L995" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L990-L999" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "interface", @@ -71786,6 +71874,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L706-L739" ======= @@ -71797,6 +71886,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L688-L718" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L692-L722" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "inherits": { @@ -71885,6 +71977,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L741-L747" ======= @@ -71896,6 +71989,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L720-L726" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L724-L730" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "extDocId": "search-aggregations-random-sampler-aggregation", @@ -71970,6 +72066,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L771-L780" ======= @@ -71981,6 +72078,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L728-L734" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L732-L738" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "inherits": { @@ -72294,6 +72394,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L817-L884" ======= @@ -72305,6 +72406,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L771-L835" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L775-L839" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "interface", @@ -72340,6 +72444,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L782-L791" ======= @@ -72351,6 +72456,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L736-L745" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L740-L749" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "enum", @@ -72374,6 +72482,7 @@ }, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1067-L1072" ======= @@ -72385,6 +72494,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L997-L1002" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L1001-L1006" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "interface", @@ -72408,6 +72520,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L793-L798" ======= @@ -72419,6 +72532,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L747-L752" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L751-L756" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "interface", @@ -72454,6 +72570,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L800-L809" ======= @@ -72465,6 +72582,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L754-L763" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L758-L767" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "interface", @@ -72475,6 +72595,7 @@ "properties": [], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L811-L811" ======= @@ -72486,6 +72607,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L765-L765" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L769-L769" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "interface", @@ -72508,6 +72632,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L813-L815" ======= @@ -72519,6 +72644,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L767-L769" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L771-L773" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "extDocId": "search-aggregations-bucket-significanttext-aggregation", @@ -72743,6 +72871,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L886-L961" ======= @@ -72754,6 +72883,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L837-L909" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L841-L913" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "inherits": { @@ -73066,6 +73198,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L963-L1031" }, @@ -73120,6 +73253,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L911-L976" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L915-L980" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "inherits": { @@ -73749,6 +73885,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1091-L1115" ======= @@ -73760,6 +73897,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1021-L1042" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L1025-L1046" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "interface", @@ -88796,7 +88936,7 @@ "name": "FieldDateMath", "namespace": "_types.aggregations" }, - "specLocation": "_types/aggregations/bucket.ts#L679-L686", + "specLocation": "_types/aggregations/bucket.ts#L683-L690", "type": { "items": [ { diff --git a/output/schema/schema.json b/output/schema/schema.json index f21add04f2..01173b6a6b 100644 --- a/output/schema/schema.json +++ b/output/schema/schema.json @@ -55829,6 +55829,7 @@ }, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1052-L1054", ======= @@ -55840,6 +55841,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L982-L984", >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L986-L988", +>>>>>>> 985e70b37 (Revert "removed term range aggregation") "type": { "kind": "union_of", "items": [ @@ -57073,14 +57077,15 @@ "codegenNames": [ "untyped", "date", - "number" + "number", + "term" ], "kind": "type_alias", "name": { "name": "AggregationRange", "namespace": "_types.aggregations" }, - "specLocation": "_types/aggregations/bucket.ts#L650-L657", + "specLocation": "_types/aggregations/bucket.ts#L650-L658", "type": { "items": [ { @@ -57103,6 +57108,13 @@ "name": "NumberAggregationRange", "namespace": "_types.aggregations" } + }, + { + "kind": "instance_of", + "type": { + "name": "TermAggregationRange", + "namespace": "_types.aggregations" + } } ], "kind": "union_of" @@ -57209,6 +57221,7 @@ } ], <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L683-L696" >>>>>>> 9fd43f8ed (making range aggregation untagged union) @@ -57218,6 +57231,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L658-L671" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L660-L673" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "interface", @@ -58512,6 +58528,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1117-L1182" ======= @@ -58523,6 +58540,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1044-L1108" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L1048-L1112" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "type_alias", @@ -58536,6 +58556,7 @@ }, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1184-L1187", ======= @@ -58547,6 +58568,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1110-L1113", >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L1114-L1117", +>>>>>>> 985e70b37 (Revert "removed term range aggregation") "type": { "kind": "union_of", "items": [ @@ -58601,6 +58625,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L782-L791" ======= @@ -58612,6 +58637,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L736-L745" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L740-L749" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "interface", @@ -59236,6 +59264,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1189-L1193" ======= @@ -59246,6 +59275,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1115-L1119" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L1119-L1123" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "inherits": { @@ -59269,12 +59301,16 @@ "namespace": "_types.aggregations" }, "properties": [], +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L681-L681" >>>>>>> 07886ab3f (same as range query) ======= "specLocation": "_types/aggregations/bucket.ts#L677-L677" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L681-L681" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "interface", @@ -60382,6 +60418,7 @@ "namespace": "_types.aggregations" }, <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L309-L316", ======= @@ -60390,6 +60427,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L679-L686", >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L683-L690", +>>>>>>> 985e70b37 (Revert "removed term range aggregation") "type": { "kind": "union_of", "items": [ @@ -60712,6 +60752,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1240-L1267" ======= @@ -60723,6 +60764,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1166-L1190" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L1170-L1194" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "interface", @@ -60824,6 +60868,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1226-L1238" ======= @@ -60835,6 +60880,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1152-L1164" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L1156-L1168" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "enum", @@ -61743,6 +61791,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L793-L798" ======= @@ -61754,6 +61803,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L747-L752" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L751-L756" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "interface", @@ -62654,6 +62706,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1195-L1224" ======= @@ -62665,6 +62718,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1121-L1150" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L1125-L1154" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "interface", @@ -64314,6 +64370,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L800-L809" ======= @@ -64325,6 +64382,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L754-L763" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L758-L767" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "interface", @@ -64469,7 +64529,7 @@ "namespace": "_types.aggregations" }, "properties": [], - "specLocation": "_types/aggregations/bucket.ts#L673-L673" + "specLocation": "_types/aggregations/bucket.ts#L675-L675" }, { >>>>>>> 9fd43f8ed (making range aggregation untagged union) @@ -64533,6 +64593,7 @@ "properties": [], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L811-L811" ======= @@ -64544,6 +64605,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L765-L765" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L769-L769" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "interface", @@ -65205,6 +65269,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L706-L739" ======= @@ -65216,6 +65281,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L688-L718" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L692-L722" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "interface", @@ -65366,6 +65434,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L741-L747" ======= @@ -65377,6 +65446,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L720-L726" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L724-L730" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "interface", @@ -65428,6 +65500,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L771-L780" ======= @@ -65439,6 +65512,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L728-L734" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L732-L738" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "enum", @@ -65487,6 +65563,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L813-L815" ======= @@ -65498,6 +65575,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L767-L769" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L771-L773" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "interface", @@ -66013,6 +66093,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L817-L884" ======= @@ -66024,6 +66105,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L771-L835" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L775-L839" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "interface", @@ -66289,6 +66373,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L886-L961" ======= @@ -66300,6 +66385,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L837-L909" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L841-L913" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "interface", @@ -67482,9 +67570,12 @@ }, { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "kind": "interface", ======= +======= +>>>>>>> 985e70b37 (Revert "removed term range aggregation") "inherits": { "generics": [ { @@ -67509,9 +67600,12 @@ "specLocation": "_types/aggregations/bucket.ts#L677-L677" }, { +<<<<<<< HEAD >>>>>>> 07886ab3f (same as range query) ======= >>>>>>> 1f832eff5 (removed term range aggregation) +======= +>>>>>>> 985e70b37 (Revert "removed term range aggregation") "generics": [ { "name": "TBucket", @@ -67783,6 +67877,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L963-L1031" ======= @@ -67794,6 +67889,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L911-L976" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L915-L980" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "enum", @@ -67813,6 +67911,7 @@ }, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1056-L1065" ======= @@ -67824,6 +67923,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L986-L995" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L990-L999" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "enum", @@ -67847,6 +67949,7 @@ }, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1067-L1072" ======= @@ -67858,6 +67961,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L997-L1002" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L1001-L1006" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "interface", @@ -67901,6 +68007,7 @@ }, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1077-L1078", ======= @@ -67912,6 +68019,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1007-L1008", >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L1011-L1012", +>>>>>>> 985e70b37 (Revert "removed term range aggregation") "type": { "kind": "union_of", "items": [ @@ -67948,6 +68058,7 @@ }, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1074-L1075", ======= @@ -67959,6 +68070,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1004-L1005", >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L1008-L1009", +>>>>>>> 985e70b37 (Revert "removed term range aggregation") "type": { "kind": "union_of", "items": [ @@ -68023,6 +68137,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1080-L1089" ======= @@ -68034,6 +68149,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1010-L1019" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L1014-L1023" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "interface", @@ -68729,7 +68847,7 @@ "namespace": "_types.aggregations" }, "properties": [], - "specLocation": "_types/aggregations/bucket.ts#L675-L675" + "specLocation": "_types/aggregations/bucket.ts#L679-L679" }, { >>>>>>> 9fd43f8ed (making range aggregation untagged union) @@ -68902,6 +69020,7 @@ ], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "specLocation": "_types/aggregations/bucket.ts#L1091-L1115" ======= @@ -68913,6 +69032,9 @@ ======= "specLocation": "_types/aggregations/bucket.ts#L1021-L1042" >>>>>>> 1f832eff5 (removed term range aggregation) +======= + "specLocation": "_types/aggregations/bucket.ts#L1025-L1046" +>>>>>>> 985e70b37 (Revert "removed term range aggregation") }, { "kind": "interface", diff --git a/output/typescript/types.ts b/output/typescript/types.ts index 4d9ec6cd10..bd2e84a3a0 100644 --- a/output/typescript/types.ts +++ b/output/typescript/types.ts @@ -3177,6 +3177,7 @@ export interface AggregationsAggregationContainer { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD export interface AggregationsAggregationRange { from?: double | null key?: string @@ -3189,6 +3190,9 @@ export type AggregationsAggregationRange = AggregationsUntypedAggregationRange | ======= export type AggregationsAggregationRange = AggregationsUntypedAggregationRange | AggregationsDateAggregationRange | AggregationsNumberAggregationRange >>>>>>> 1f832eff5 (removed term range aggregation) +======= +export type AggregationsAggregationRange = AggregationsUntypedAggregationRange | AggregationsDateAggregationRange | AggregationsNumberAggregationRange | AggregationsTermAggregationRange +>>>>>>> 985e70b37 (Revert "removed term range aggregation") export interface AggregationsAggregationRangeBase { from?: T @@ -4338,6 +4342,9 @@ export interface AggregationsTTestAggregation { export type AggregationsTTestType = 'paired' | 'homoscedastic' | 'heteroscedastic' +export interface AggregationsTermAggregationRange extends AggregationsAggregationRangeBase { +} + export interface AggregationsTermsAggregateBase extends AggregationsMultiBucketAggregateBase { doc_count_error_upper_bound?: long sum_other_doc_count?: long diff --git a/specification/_types/aggregations/bucket.ts b/specification/_types/aggregations/bucket.ts index 8382e40849..28ea96b3bc 100644 --- a/specification/_types/aggregations/bucket.ts +++ b/specification/_types/aggregations/bucket.ts @@ -662,13 +662,15 @@ export class RangeAggregation extends BucketAggregationBase { } /** - * @codegen_names untyped, date, number + * @codegen_names untyped, date, number, term * @variants untagged untyped=_types.aggregations.UntypedAggregationRange */ export type AggregationRange = | UntypedAggregationRange | DateAggregationRange | NumberAggregationRange + | TermAggregationRange + export class AggregationRangeBase { /** * Start of the range (inclusive). @@ -686,6 +688,8 @@ export class AggregationRangeBase { export class NumberAggregationRange extends AggregationRangeBase {} +export class TermAggregationRange extends AggregationRangeBase {} + export class UntypedAggregationRange extends AggregationRangeBase {} export class DateAggregationRange extends AggregationRangeBase {} From 5b89c6e4ccf091c45c53ffd363e015968c36c540 Mon Sep 17 00:00:00 2001 From: Laura Trotta Date: Thu, 27 Mar 2025 15:20:54 +0100 Subject: [PATCH 5/5] rebase fix --- output/openapi/elasticsearch-openapi.json | 20 +- .../elasticsearch-serverless-openapi.json | 20 +- output/schema/schema-serverless.json | 833 ++---------------- output/schema/schema.json | 751 ++-------------- output/typescript/types.ts | 19 - 5 files changed, 146 insertions(+), 1497 deletions(-) diff --git a/output/openapi/elasticsearch-openapi.json b/output/openapi/elasticsearch-openapi.json index e4e4284534..ba68a20730 100644 --- a/output/openapi/elasticsearch-openapi.json +++ b/output/openapi/elasticsearch-openapi.json @@ -55081,15 +55081,7 @@ "properties": { "from": { "description": "Start of the range (inclusive).", - "oneOf": [ - { - "type": "number" - }, - { - "nullable": true, - "type": "string" - } - ] + "type": "number" }, "key": { "description": "Custom key to return the range with.", @@ -55097,15 +55089,7 @@ }, "to": { "description": "End of the range (exclusive).", - "oneOf": [ - { - "type": "number" - }, - { - "nullable": true, - "type": "string" - } - ] + "type": "number" } } }, diff --git a/output/openapi/elasticsearch-serverless-openapi.json b/output/openapi/elasticsearch-serverless-openapi.json index 761fe11524..75c57caa50 100644 --- a/output/openapi/elasticsearch-serverless-openapi.json +++ b/output/openapi/elasticsearch-serverless-openapi.json @@ -34220,15 +34220,7 @@ "properties": { "from": { "description": "Start of the range (inclusive).", - "oneOf": [ - { - "type": "number" - }, - { - "nullable": true, - "type": "string" - } - ] + "type": "number" }, "key": { "description": "Custom key to return the range with.", @@ -34236,15 +34228,7 @@ }, "to": { "description": "End of the range (exclusive).", - "oneOf": [ - { - "type": "number" - }, - { - "nullable": true, - "type": "string" - } - ] + "type": "number" } } }, diff --git a/output/schema/schema-serverless.json b/output/schema/schema-serverless.json index bd18dcfd52..ac6bf6fdcd 100644 --- a/output/schema/schema-serverless.json +++ b/output/schema/schema-serverless.json @@ -67007,23 +67007,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L1117-L1182" -======= - "specLocation": "_types/aggregations/bucket.ts#L1060-L1124" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L1048-L1112" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L1044-L1108" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L1048-L1112" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1114-L1179" }, { "codegenNames": [ @@ -67035,23 +67019,7 @@ "name": "CategorizeTextAnalyzer", "namespace": "_types.aggregations" }, -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L1184-L1187", -======= - "specLocation": "_types/aggregations/bucket.ts#L1126-L1129", ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L1114-L1117", ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L1110-L1113", ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L1114-L1117", ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1181-L1184", "type": { "items": [ { @@ -67119,23 +67087,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L1189-L1193" -======= - "specLocation": "_types/aggregations/bucket.ts#L1131-L1135" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L1119-L1123" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L1115-L1119" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L1119-L1123" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1186-L1190" }, { "inherits": { @@ -68007,11 +67959,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L508-L517" -======= - "specLocation": "_types/aggregations/bucket.ts#L467-L476" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L481-L490" }, { "kind": "type_alias", @@ -68019,23 +67967,7 @@ "name": "AggregateOrder", "namespace": "_types.aggregations" }, -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L1052-L1054", -======= - "specLocation": "_types/aggregations/bucket.ts#L998-L1000", ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L986-L988", ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L982-L984", ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L986-L988", ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1049-L1051", "type": { "items": [ { @@ -68194,7 +68126,7 @@ "namespace": "_types.aggregations" }, "properties": [], - "specLocation": "_types/aggregations/bucket.ts#L681-L681" + "specLocation": "_types/aggregations/bucket.ts#L695-L695" }, { "generics": [ @@ -68246,66 +68178,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L318-L331" - }, - { - "codegenNames": [ - "expr", - "value" - ], - "description": "A date range limit, represented either as a DateMath expression or a number expressed\naccording to the target field's precision.", - "kind": "type_alias", - "name": { - "name": "FieldDateMath", - "namespace": "_types.aggregations" - }, - "specLocation": "_types/aggregations/bucket.ts#L309-L316", - "type": { - "items": [ - { - "kind": "instance_of", - "type": { - "name": "DateMath", - "namespace": "_types" - } - }, - { - "kind": "instance_of", - "type": { - "name": "double", - "namespace": "_types" - } - } - ], - "kind": "union_of" - } - }, - { - "kind": "type_alias", - "name": { - "name": "DateMath", - "namespace": "_types" - }, - "specLocation": "_types/Time.ts#L42-L42", - "type": { - "kind": "instance_of", - "type": { - "name": "string", - "namespace": "_builtins" - } - } -======= - "specLocation": "_types/aggregations/bucket.ts#L660-L673" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L658-L671" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L660-L673" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L674-L687" }, { "inherits": { @@ -68323,8 +68196,6 @@ "specLocation": "_types/aggregations/pipeline.ts#L216-L216" }, { - "extDocId": "search-aggregations-bucket-diversified-sampler-aggregation", - "extDocUrl": "https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-diversified-sampler-aggregation.html", "inherits": { "type": { "name": "BucketAggregationBase", @@ -68400,11 +68271,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L333-L357" -======= - "specLocation": "_types/aggregations/bucket.ts#L298-L319" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L309-L330" }, { "kind": "enum", @@ -68426,11 +68293,7 @@ "name": "SamplerAggregationExecutionHint", "namespace": "_types.aggregations" }, -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L359-L372" -======= - "specLocation": "_types/aggregations/bucket.ts#L321-L334" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L332-L345" }, { "inherits": { @@ -68564,23 +68427,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L1240-L1267" -======= - "specLocation": "_types/aggregations/bucket.ts#L1182-L1206" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L1170-L1194" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L1166-L1190" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L1170-L1194" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1237-L1264" }, { "kind": "interface", @@ -68625,23 +68472,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L1226-L1238" -======= - "specLocation": "_types/aggregations/bucket.ts#L1168-L1180" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L1156-L1168" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L1152-L1164" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L1156-L1168" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1223-L1235" }, { "codegenNames": [ @@ -68653,23 +68484,7 @@ "name": "TermsExclude", "namespace": "_types.aggregations" }, -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L1077-L1078", -======= - "specLocation": "_types/aggregations/bucket.ts#L1023-L1024", ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L1011-L1012", ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L1007-L1008", ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L1011-L1012", ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1074-L1075", "type": { "items": [ { @@ -68704,23 +68519,7 @@ "name": "TermsInclude", "namespace": "_types.aggregations" }, -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L1074-L1075", -======= - "specLocation": "_types/aggregations/bucket.ts#L1020-L1021", ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L1008-L1009", ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L1004-L1005", ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L1008-L1009", ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1071-L1072", "type": { "items": [ { @@ -68783,23 +68582,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L1080-L1089" -======= - "specLocation": "_types/aggregations/bucket.ts#L1026-L1035" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L1014-L1023" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L1010-L1019" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L1014-L1023" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1077-L1086" }, { "inherits": { @@ -68874,11 +68657,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L374-L394" -======= - "specLocation": "_types/aggregations/bucket.ts#L336-L356" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L347-L367" }, { "codegenNames": [ @@ -69080,11 +68859,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L396-L419" -======= - "specLocation": "_types/aggregations/bucket.ts#L358-L381" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L369-L392" }, { "codegenNames": [ @@ -69098,7 +68873,7 @@ "name": "AggregationRange", "namespace": "_types.aggregations" }, - "specLocation": "_types/aggregations/bucket.ts#L650-L658", + "specLocation": "_types/aggregations/bucket.ts#L664-L672", "type": { "items": [ { @@ -69158,114 +68933,7 @@ "namespace": "_types.aggregations" }, "properties": [], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L702-L702" - }, - { - "generics": [ - { - "name": "T", - "namespace": "_types.aggregations.AggregationRangeBase" - } - ], - "kind": "interface", - "name": { - "name": "AggregationRangeBase", - "namespace": "_types.aggregations" - }, - "properties": [ - { - "description": "Start of the range (inclusive).", - "name": "from", - "required": false, - "type": { -<<<<<<< HEAD - "items": [ - { - "kind": "instance_of", - "type": { - "name": "double", - "namespace": "_types" - } - }, - { - "kind": "instance_of", - "type": { - "name": "null", - "namespace": "_builtins" - } - } - ], - "kind": "union_of" -======= - "kind": "instance_of", - "type": { - "name": "T", - "namespace": "_types.aggregations.AggregationRangeBase" - } ->>>>>>> 9fd43f8ed (making range aggregation untagged union) - } - }, - { - "description": "Custom key to return the range with.", - "name": "key", - "required": false, - "type": { - "kind": "instance_of", - "type": { - "name": "string", - "namespace": "_builtins" - } - } - }, - { - "description": "End of the range (exclusive).", - "name": "to", - "required": false, - "type": { -<<<<<<< HEAD - "items": [ - { - "kind": "instance_of", - "type": { - "name": "double", - "namespace": "_types" - } - }, - { - "kind": "instance_of", - "type": { - "name": "null", - "namespace": "_builtins" - } - } - ], - "kind": "union_of" - } - } - ], - "specLocation": "_types/aggregations/bucket.ts#L691-L704" -======= - "kind": "instance_of", - "type": { - "name": "T", - "namespace": "_types.aggregations.AggregationRangeBase" - } - } - } - ], - "specLocation": "_types/aggregations/bucket.ts#L683-L696" -======= - "specLocation": "_types/aggregations/bucket.ts#L679-L679" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L675-L675" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L679-L679" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L693-L693" }, { "inherits": { @@ -69289,36 +68957,7 @@ "namespace": "_types.aggregations" }, "properties": [], -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L675-L675" -======= - "specLocation": "_types/aggregations/bucket.ts#L675-L675" - }, - { - "inherits": { - "generics": [ - { - "kind": "instance_of", - "type": { - "name": "string", - "namespace": "_builtins" - } - } - ], - "type": { - "name": "AggregationRangeBase", - "namespace": "_types.aggregations" - } - }, - "kind": "interface", - "name": { - "name": "TermAggregationRange", - "namespace": "_types.aggregations" - }, - "properties": [], - "specLocation": "_types/aggregations/bucket.ts#L677-L677" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L689-L689" }, { "inherits": { @@ -69342,15 +68981,7 @@ "namespace": "_types.aggregations" }, "properties": [], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L700-L700" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L677-L677" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L673-L673" ->>>>>>> 1f832eff5 (removed term range aggregation) + "specLocation": "_types/aggregations/bucket.ts#L691-L691" }, { "extDocId": "search-aggregations-bucket-geohashgrid-aggregation", @@ -69430,11 +69061,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L421-L449" -======= - "specLocation": "_types/aggregations/bucket.ts#L383-L408" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L394-L422" }, { "codegenNames": [ @@ -69660,11 +69287,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L451-L477" -======= - "specLocation": "_types/aggregations/bucket.ts#L410-L436" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L424-L450" }, { "kind": "type_alias", @@ -69757,11 +69380,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L479-L504" -======= - "specLocation": "_types/aggregations/bucket.ts#L438-L463" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L452-L477" }, { "inherits": { @@ -69776,11 +69395,7 @@ "namespace": "_types.aggregations" }, "properties": [], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L506-L506" -======= - "specLocation": "_types/aggregations/bucket.ts#L465-L465" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L479-L479" }, { "inherits": { @@ -69945,11 +69560,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L519-L565" -======= - "specLocation": "_types/aggregations/bucket.ts#L478-L524" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L492-L538" }, { "inherits": { @@ -69992,11 +69603,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L567-L576" -======= - "specLocation": "_types/aggregations/bucket.ts#L526-L535" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L540-L549" }, { "kind": "interface", @@ -70066,11 +69673,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L578-L591" -======= - "specLocation": "_types/aggregations/bucket.ts#L537-L550" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L551-L564" }, { "inherits": { @@ -70161,23 +69764,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L1195-L1224" -======= - "specLocation": "_types/aggregations/bucket.ts#L1137-L1166" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L1125-L1154" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L1121-L1150" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L1125-L1154" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1192-L1221" }, { "inherits": { @@ -70578,11 +70165,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L593-L599" -======= - "specLocation": "_types/aggregations/bucket.ts#L552-L558" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L566-L572" }, { "kind": "type_alias", @@ -71244,11 +70827,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L601-L641" -======= - "specLocation": "_types/aggregations/bucket.ts#L560-L600" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L574-L614" }, { "kind": "enum", @@ -71266,23 +70845,7 @@ "name": "TermsAggregationCollectMode", "namespace": "_types.aggregations" }, -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L1056-L1065" -======= - "specLocation": "_types/aggregations/bucket.ts#L1002-L1011" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L990-L999" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L986-L995" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L990-L999" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1053-L1062" }, { "kind": "interface", @@ -71316,11 +70879,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L643-L653" -======= - "specLocation": "_types/aggregations/bucket.ts#L602-L612" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L616-L626" }, { "inherits": { @@ -71348,11 +70907,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L655-L660" -======= - "specLocation": "_types/aggregations/bucket.ts#L614-L619" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L628-L633" }, { "extDocId": "search-aggregations-pipeline-normalize-aggregation", @@ -71445,11 +71000,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L662-L667" -======= - "specLocation": "_types/aggregations/bucket.ts#L621-L626" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L635-L640" }, { "extDocId": "search-aggregations-metrics-percentile-rank-aggregation", @@ -71765,15 +71316,9 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L669-L689" -======= - "specLocation": "_types/aggregations/bucket.ts#L628-L648" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L642-L662" }, { - "extDocId": "search-aggregations-bucket-rare-terms-aggregation", - "extDocUrl": "https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-rare-terms-aggregation.html", "inherits": { "type": { "name": "BucketAggregationBase", @@ -71872,23 +71417,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L706-L739" -======= - "specLocation": "_types/aggregations/bucket.ts#L704-L734" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L692-L722" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L688-L718" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L692-L722" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L706-L736" }, { "inherits": { @@ -71975,23 +71504,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L741-L747" -======= - "specLocation": "_types/aggregations/bucket.ts#L736-L742" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L724-L730" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L720-L726" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L724-L730" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L738-L744" }, { "extDocId": "search-aggregations-random-sampler-aggregation", @@ -72033,7 +71546,7 @@ } } ], - "specLocation": "_types/aggregations/bucket.ts#L749-L769" + "specLocation": "_types/aggregations/bucket.ts#L746-L766" }, { "extDocId": "search-aggregations-bucket-sampler-aggregation", @@ -72064,23 +71577,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L771-L780" -======= - "specLocation": "_types/aggregations/bucket.ts#L744-L750" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L732-L738" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L728-L734" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L732-L738" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L768-L777" }, { "inherits": { @@ -72392,23 +71889,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L817-L884" -======= - "specLocation": "_types/aggregations/bucket.ts#L787-L851" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L775-L839" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L771-L835" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L775-L839" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L814-L881" }, { "kind": "interface", @@ -72442,23 +71923,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L782-L791" -======= - "specLocation": "_types/aggregations/bucket.ts#L752-L761" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L740-L749" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L736-L745" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L740-L749" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L779-L788" }, { "kind": "enum", @@ -72480,23 +71945,7 @@ "name": "TermsAggregationExecutionHint", "namespace": "_types.aggregations" }, -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L1067-L1072" -======= - "specLocation": "_types/aggregations/bucket.ts#L1013-L1018" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L1001-L1006" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L997-L1002" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L1001-L1006" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1064-L1069" }, { "kind": "interface", @@ -72518,23 +71967,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L793-L798" -======= - "specLocation": "_types/aggregations/bucket.ts#L763-L768" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L751-L756" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L747-L752" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L751-L756" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L790-L795" }, { "kind": "interface", @@ -72568,23 +72001,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L800-L809" -======= - "specLocation": "_types/aggregations/bucket.ts#L770-L779" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L758-L767" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L754-L763" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L758-L767" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L797-L806" }, { "kind": "interface", @@ -72593,23 +72010,7 @@ "namespace": "_types.aggregations" }, "properties": [], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L811-L811" -======= - "specLocation": "_types/aggregations/bucket.ts#L781-L781" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L769-L769" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L765-L765" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L769-L769" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L808-L808" }, { "kind": "interface", @@ -72630,23 +72031,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L813-L815" -======= - "specLocation": "_types/aggregations/bucket.ts#L783-L785" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L771-L773" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L767-L769" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L771-L773" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L810-L812" }, { "extDocId": "search-aggregations-bucket-significanttext-aggregation", @@ -72869,23 +72254,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L886-L961" -======= - "specLocation": "_types/aggregations/bucket.ts#L853-L925" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L841-L913" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L837-L909" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L841-L913" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L883-L958" }, { "inherits": { @@ -73196,11 +72565,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L963-L1031" + "specLocation": "_types/aggregations/bucket.ts#L960-L1028" }, { "extDocId": "search-aggregations-bucket-time-series-aggregation", @@ -73243,19 +72608,7 @@ } } ], - "specLocation": "_types/aggregations/bucket.ts#L1033-L1046" -======= - "specLocation": "_types/aggregations/bucket.ts#L927-L992" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L915-L980" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L911-L976" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L915-L980" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1030-L1043" }, { "inherits": { @@ -73883,23 +73236,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L1091-L1115" -======= - "specLocation": "_types/aggregations/bucket.ts#L1037-L1058" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L1025-L1046" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L1021-L1042" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L1025-L1046" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1088-L1112" }, { "kind": "interface", @@ -84682,9 +84019,6 @@ { "kind": "type_alias", "name": { -<<<<<<< HEAD - "name": "EsqlResult", -======= "name": "DateMath", "namespace": "_types" }, @@ -84700,8 +84034,7 @@ { "kind": "type_alias", "name": { - "name": "EsqlColumns", ->>>>>>> 07886ab3f (same as range query) + "name": "EsqlResult", "namespace": "_types" }, "specLocation": "_types/Binary.ts#L24-L24", @@ -85829,6 +85162,38 @@ } } }, + { + "codegenNames": [ + "expr", + "value" + ], + "description": "A date range limit, represented either as a DateMath expression or a number expressed\naccording to the target field's precision.", + "kind": "type_alias", + "name": { + "name": "FieldDateMath", + "namespace": "_types.aggregations" + }, + "specLocation": "_types/aggregations/bucket.ts#L697-L704", + "type": { + "items": [ + { + "kind": "instance_of", + "type": { + "name": "DateMath", + "namespace": "_types" + } + }, + { + "kind": "instance_of", + "type": { + "name": "double", + "namespace": "_types" + } + } + ], + "kind": "union_of" + } + }, { "kind": "type_alias", "name": { @@ -88925,38 +88290,6 @@ ], "specLocation": "_types/analysis/analyzers.ts#L317-L321" }, - { - "codegenNames": [ - "expr", - "value" - ], - "description": "A date range limit, represented either as a DateMath expression or a number expressed\naccording to the target field's precision.", - "kind": "type_alias", - "name": { - "name": "FieldDateMath", - "namespace": "_types.aggregations" - }, - "specLocation": "_types/aggregations/bucket.ts#L683-L690", - "type": { - "items": [ - { - "kind": "instance_of", - "type": { - "name": "DateMath", - "namespace": "_types" - } - }, - { - "kind": "instance_of", - "type": { - "name": "double", - "namespace": "_types" - } - } - ], - "kind": "union_of" - } - }, { "codegenNames": [ "name", diff --git a/output/schema/schema.json b/output/schema/schema.json index 01173b6a6b..b7ec8cad56 100644 --- a/output/schema/schema.json +++ b/output/schema/schema.json @@ -55827,23 +55827,7 @@ "name": "AggregateOrder", "namespace": "_types.aggregations" }, -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L1052-L1054", -======= - "specLocation": "_types/aggregations/bucket.ts#L998-L1000", ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L986-L988", ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L982-L984", ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L986-L988", ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1049-L1051", "type": { "kind": "union_of", "items": [ @@ -57074,19 +57058,20 @@ } }, { + "kind": "type_alias", "codegenNames": [ "untyped", "date", "number", "term" ], - "kind": "type_alias", "name": { "name": "AggregationRange", "namespace": "_types.aggregations" }, - "specLocation": "_types/aggregations/bucket.ts#L650-L658", + "specLocation": "_types/aggregations/bucket.ts#L664-L672", "type": { + "kind": "union_of", "items": [ { "kind": "instance_of", @@ -57116,8 +57101,7 @@ "namespace": "_types.aggregations" } } - ], - "kind": "union_of" + ] }, "variants": { "kind": "untagged", @@ -57128,13 +57112,13 @@ } }, { + "kind": "interface", "generics": [ { "name": "T", "namespace": "_types.aggregations.AggregationRangeBase" } ], - "kind": "interface", "name": { "name": "AggregationRangeBase", "namespace": "_types.aggregations" @@ -57145,31 +57129,11 @@ "name": "from", "required": false, "type": { -<<<<<<< HEAD - "kind": "union_of", - "items": [ - { - "kind": "instance_of", - "type": { - "name": "double", - "namespace": "_types" - } - }, - { - "kind": "instance_of", - "type": { - "name": "null", - "namespace": "_builtins" - } - } - ] -======= "kind": "instance_of", "type": { "name": "T", "namespace": "_types.aggregations.AggregationRangeBase" } ->>>>>>> 9fd43f8ed (making range aggregation untagged union) } }, { @@ -57189,29 +57153,6 @@ "name": "to", "required": false, "type": { -<<<<<<< HEAD - "kind": "union_of", - "items": [ - { - "kind": "instance_of", - "type": { - "name": "double", - "namespace": "_types" - } - }, - { - "kind": "instance_of", - "type": { - "name": "null", - "namespace": "_builtins" - } - } - ] - } - } - ], - "specLocation": "_types/aggregations/bucket.ts#L691-L704" -======= "kind": "instance_of", "type": { "name": "T", @@ -57220,20 +57161,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L683-L696" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L660-L673" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L658-L671" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L660-L673" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L674-L687" }, { "kind": "interface", @@ -58526,23 +58454,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L1117-L1182" -======= - "specLocation": "_types/aggregations/bucket.ts#L1060-L1124" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L1048-L1112" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L1044-L1108" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L1048-L1112" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1114-L1179" }, { "kind": "type_alias", @@ -58554,23 +58466,7 @@ "name": "CategorizeTextAnalyzer", "namespace": "_types.aggregations" }, -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L1184-L1187", -======= - "specLocation": "_types/aggregations/bucket.ts#L1126-L1129", ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L1114-L1117", ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L1110-L1113", ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L1114-L1117", ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1181-L1184", "type": { "kind": "union_of", "items": [ @@ -58623,23 +58519,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L782-L791" -======= - "specLocation": "_types/aggregations/bucket.ts#L752-L761" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L740-L749" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L736-L745" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L740-L749" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L779-L788" }, { "kind": "interface", @@ -59262,24 +59142,10 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L1189-L1193" -======= - "specLocation": "_types/aggregations/bucket.ts#L1131-L1135" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L1119-L1123" -======= - "specLocation": "_types/aggregations/bucket.ts#L1115-L1119" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L1119-L1123" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1186-L1190" }, { + "kind": "interface", "inherits": { "generics": [ { @@ -59295,22 +59161,12 @@ "namespace": "_types.aggregations" } }, - "kind": "interface", "name": { "name": "DateAggregationRange", "namespace": "_types.aggregations" }, "properties": [], -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L681-L681" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L677-L677" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L681-L681" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L695-L695" }, { "kind": "interface", @@ -59722,58 +59578,9 @@ "specLocation": "_types/aggregations/bucket.ts#L281-L307" }, { -<<<<<<< HEAD - "kind": "interface", - "name": { - "name": "DateRangeExpression", - "namespace": "_types.aggregations" - }, - "properties": [ - { - "description": "Start of the range (inclusive).", - "name": "from", - "required": false, - "type": { - "kind": "instance_of", - "type": { - "name": "FieldDateMath", - "namespace": "_types.aggregations" - } - } - }, - { - "description": "Custom key to return the range with.", - "name": "key", - "required": false, - "type": { - "kind": "instance_of", - "type": { - "name": "string", - "namespace": "_builtins" - } - } - }, - { - "description": "End of the range (exclusive).", - "name": "to", - "required": false, - "type": { - "kind": "instance_of", - "type": { - "name": "FieldDateMath", - "namespace": "_types.aggregations" - } - } - } - ], - "specLocation": "_types/aggregations/bucket.ts#L318-L331" - }, - { "kind": "interface", "extDocId": "search-aggregations-pipeline-derivative-aggregation", "extDocUrl": "https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-pipeline-derivative-aggregation.html", -======= ->>>>>>> 07886ab3f (same as range query) "inherits": { "type": { "name": "SingleMetricAggregateBase", @@ -59828,8 +59635,6 @@ }, { "kind": "interface", - "extDocId": "search-aggregations-bucket-diversified-sampler-aggregation", - "extDocUrl": "https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-diversified-sampler-aggregation.html", "inherits": { "type": { "name": "BucketAggregationBase", @@ -59904,11 +59709,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L333-L357" -======= - "specLocation": "_types/aggregations/bucket.ts#L298-L319" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L309-L330" }, { "kind": "interface", @@ -60071,11 +59872,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L508-L517" -======= - "specLocation": "_types/aggregations/bucket.ts#L467-L476" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L481-L490" }, { "kind": "interface", @@ -60417,19 +60214,7 @@ "name": "FieldDateMath", "namespace": "_types.aggregations" }, -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L309-L316", -======= - "specLocation": "_types/aggregations/bucket.ts#L683-L690", ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L679-L686", ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L683-L690", ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L697-L704", "type": { "kind": "union_of", "items": [ @@ -60571,11 +60356,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L374-L394" -======= - "specLocation": "_types/aggregations/bucket.ts#L336-L356" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L347-L367" }, { "kind": "interface", @@ -60750,23 +60531,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L1240-L1267" -======= - "specLocation": "_types/aggregations/bucket.ts#L1182-L1206" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L1170-L1194" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L1166-L1190" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L1170-L1194" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1237-L1264" }, { "kind": "interface", @@ -60866,23 +60631,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L1226-L1238" -======= - "specLocation": "_types/aggregations/bucket.ts#L1168-L1180" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L1156-L1168" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L1152-L1164" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L1156-L1168" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1223-L1235" }, { "kind": "enum", @@ -61144,11 +60893,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L396-L419" -======= - "specLocation": "_types/aggregations/bucket.ts#L358-L381" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L369-L392" }, { "kind": "interface", @@ -61253,11 +60998,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L421-L449" -======= - "specLocation": "_types/aggregations/bucket.ts#L383-L408" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L394-L422" }, { "kind": "interface", @@ -61611,11 +61352,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L451-L477" -======= - "specLocation": "_types/aggregations/bucket.ts#L410-L436" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L424-L450" }, { "kind": "interface", @@ -61723,11 +61460,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L479-L504" -======= - "specLocation": "_types/aggregations/bucket.ts#L438-L463" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L452-L477" }, { "kind": "interface", @@ -61763,11 +61496,7 @@ "namespace": "_types.aggregations" }, "properties": [], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L506-L506" -======= - "specLocation": "_types/aggregations/bucket.ts#L465-L465" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L479-L479" }, { "kind": "interface", @@ -61789,23 +61518,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L793-L798" -======= - "specLocation": "_types/aggregations/bucket.ts#L763-L768" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L751-L756" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L747-L752" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L751-L756" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L790-L795" }, { "kind": "interface", @@ -62051,11 +61764,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L519-L565" -======= - "specLocation": "_types/aggregations/bucket.ts#L478-L524" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L492-L538" }, { "kind": "interface", @@ -62704,23 +62413,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L1195-L1224" -======= - "specLocation": "_types/aggregations/bucket.ts#L1137-L1166" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L1125-L1154" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L1121-L1150" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L1125-L1154" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1192-L1221" }, { "kind": "interface", @@ -62853,11 +62546,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L567-L576" -======= - "specLocation": "_types/aggregations/bucket.ts#L526-L535" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L540-L549" }, { "kind": "interface", @@ -62927,11 +62616,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L578-L591" -======= - "specLocation": "_types/aggregations/bucket.ts#L537-L550" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L551-L564" }, { "kind": "interface", @@ -63762,11 +63447,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L593-L599" -======= - "specLocation": "_types/aggregations/bucket.ts#L552-L558" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L566-L572" }, { "kind": "enum", @@ -64124,11 +63805,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L643-L653" -======= - "specLocation": "_types/aggregations/bucket.ts#L602-L612" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L616-L626" }, { "kind": "interface", @@ -64275,11 +63952,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L601-L641" -======= - "specLocation": "_types/aggregations/bucket.ts#L560-L600" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L574-L614" }, { "kind": "interface", @@ -64368,23 +64041,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L800-L809" -======= - "specLocation": "_types/aggregations/bucket.ts#L770-L779" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L758-L767" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L754-L763" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L758-L767" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L797-L806" }, { "kind": "interface", @@ -64433,11 +64090,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L655-L660" -======= - "specLocation": "_types/aggregations/bucket.ts#L614-L619" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L628-L633" }, { "kind": "interface", @@ -64505,9 +64158,7 @@ "specLocation": "_types/aggregations/pipeline.ts#L361-L387" }, { -<<<<<<< HEAD "kind": "interface", -======= "inherits": { "generics": [ { @@ -64523,16 +64174,15 @@ "namespace": "_types.aggregations" } }, - "kind": "interface", "name": { "name": "NumberAggregationRange", "namespace": "_types.aggregations" }, "properties": [], - "specLocation": "_types/aggregations/bucket.ts#L675-L675" + "specLocation": "_types/aggregations/bucket.ts#L689-L689" }, { ->>>>>>> 9fd43f8ed (making range aggregation untagged union) + "kind": "interface", "attachedBehaviors": [ "AdditionalProperties" ], @@ -64578,11 +64228,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L662-L667" -======= - "specLocation": "_types/aggregations/bucket.ts#L621-L626" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L635-L640" }, { "kind": "interface", @@ -64591,23 +64237,7 @@ "namespace": "_types.aggregations" }, "properties": [], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L811-L811" -======= - "specLocation": "_types/aggregations/bucket.ts#L781-L781" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L769-L769" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L765-L765" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L769-L769" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L808-L808" }, { "kind": "interface", @@ -64969,7 +64599,7 @@ } } ], - "specLocation": "_types/aggregations/bucket.ts#L749-L769" + "specLocation": "_types/aggregations/bucket.ts#L746-L766" }, { "kind": "interface", @@ -65085,11 +64715,7 @@ } } ], -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L669-L689" -======= - "specLocation": "_types/aggregations/bucket.ts#L628-L648" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L642-L662" }, { "kind": "interface", @@ -65168,8 +64794,6 @@ }, { "kind": "interface", - "extDocId": "search-aggregations-bucket-rare-terms-aggregation", - "extDocUrl": "https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-rare-terms-aggregation.html", "inherits": { "type": { "name": "BucketAggregationBase", @@ -65267,23 +64891,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L706-L739" -======= - "specLocation": "_types/aggregations/bucket.ts#L704-L734" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L692-L722" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L688-L718" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L692-L722" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L706-L736" }, { "kind": "interface", @@ -65432,23 +65040,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L741-L747" -======= - "specLocation": "_types/aggregations/bucket.ts#L736-L742" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L724-L730" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L720-L726" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L724-L730" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L738-L744" }, { "kind": "interface", @@ -65498,23 +65090,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L771-L780" -======= - "specLocation": "_types/aggregations/bucket.ts#L744-L750" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L732-L738" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L728-L734" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L732-L738" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L768-L777" }, { "kind": "enum", @@ -65536,11 +65112,7 @@ "name": "SamplerAggregationExecutionHint", "namespace": "_types.aggregations" }, -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L359-L372" -======= - "specLocation": "_types/aggregations/bucket.ts#L321-L334" ->>>>>>> 07886ab3f (same as range query) + "specLocation": "_types/aggregations/bucket.ts#L332-L345" }, { "kind": "interface", @@ -65561,23 +65133,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L813-L815" -======= - "specLocation": "_types/aggregations/bucket.ts#L783-L785" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L771-L773" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L767-L769" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L771-L773" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L810-L812" }, { "kind": "interface", @@ -66091,23 +65647,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L817-L884" -======= - "specLocation": "_types/aggregations/bucket.ts#L787-L851" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L775-L839" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L771-L835" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L775-L839" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L814-L881" }, { "kind": "interface", @@ -66371,23 +65911,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L886-L961" -======= - "specLocation": "_types/aggregations/bucket.ts#L853-L925" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L841-L913" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L837-L909" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L841-L913" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L883-L958" }, { "kind": "interface", @@ -66978,37 +66502,7 @@ "specLocation": "_types/aggregations/pipeline.ts#L410-L410" }, { -<<<<<<< HEAD -<<<<<<< HEAD - "kind": "interface", -======= - "inherits": { - "generics": [ - { - "kind": "instance_of", - "type": { - "name": "string", - "namespace": "_builtins" - } - } - ], - "type": { - "name": "AggregationRangeBase", - "namespace": "_types.aggregations" - } - }, "kind": "interface", - "name": { - "name": "StringAggregationRange", - "namespace": "_types.aggregations" - }, - "properties": [], - "specLocation": "_types/aggregations/bucket.ts#L700-L700" - }, - { ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= ->>>>>>> 07886ab3f (same as range query) "description": "Result of the `rare_terms` aggregation when the field is a string.", "inherits": { "generics": [ @@ -67569,13 +67063,7 @@ "specLocation": "_types/aggregations/metric.ts#L331-L344" }, { -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD "kind": "interface", -======= -======= ->>>>>>> 985e70b37 (Revert "removed term range aggregation") "inherits": { "generics": [ { @@ -67591,21 +67079,15 @@ "namespace": "_types.aggregations" } }, - "kind": "interface", "name": { "name": "TermAggregationRange", "namespace": "_types.aggregations" }, "properties": [], - "specLocation": "_types/aggregations/bucket.ts#L677-L677" + "specLocation": "_types/aggregations/bucket.ts#L691-L691" }, { -<<<<<<< HEAD ->>>>>>> 07886ab3f (same as range query) -======= ->>>>>>> 1f832eff5 (removed term range aggregation) -======= ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "kind": "interface", "generics": [ { "name": "TBucket", @@ -67875,23 +67357,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L963-L1031" -======= - "specLocation": "_types/aggregations/bucket.ts#L927-L992" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L915-L980" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L911-L976" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L915-L980" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L960-L1028" }, { "kind": "enum", @@ -67909,23 +67375,7 @@ "name": "TermsAggregationCollectMode", "namespace": "_types.aggregations" }, -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L1056-L1065" -======= - "specLocation": "_types/aggregations/bucket.ts#L1002-L1011" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L990-L999" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L986-L995" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L990-L999" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1053-L1062" }, { "kind": "enum", @@ -67947,23 +67397,7 @@ "name": "TermsAggregationExecutionHint", "namespace": "_types.aggregations" }, -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L1067-L1072" -======= - "specLocation": "_types/aggregations/bucket.ts#L1013-L1018" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L1001-L1006" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L997-L1002" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L1001-L1006" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1064-L1069" }, { "kind": "interface", @@ -68005,23 +67439,7 @@ "name": "TermsExclude", "namespace": "_types.aggregations" }, -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L1077-L1078", -======= - "specLocation": "_types/aggregations/bucket.ts#L1023-L1024", ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L1011-L1012", ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L1007-L1008", ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L1011-L1012", ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1074-L1075", "type": { "kind": "union_of", "items": [ @@ -68056,23 +67474,7 @@ "name": "TermsInclude", "namespace": "_types.aggregations" }, -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L1074-L1075", -======= - "specLocation": "_types/aggregations/bucket.ts#L1020-L1021", ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L1008-L1009", ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L1004-L1005", ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L1008-L1009", ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1071-L1072", "type": { "kind": "union_of", "items": [ @@ -68135,23 +67537,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L1080-L1089" -======= - "specLocation": "_types/aggregations/bucket.ts#L1026-L1035" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L1014-L1023" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L1010-L1019" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L1014-L1023" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1077-L1086" }, { "kind": "interface", @@ -68264,7 +67650,7 @@ } } ], - "specLocation": "_types/aggregations/bucket.ts#L1033-L1046" + "specLocation": "_types/aggregations/bucket.ts#L1030-L1043" }, { "kind": "interface", @@ -68827,9 +68213,7 @@ "variantName": "umterms" }, { -<<<<<<< HEAD "kind": "interface", -======= "inherits": { "generics": [ { @@ -68841,16 +68225,15 @@ "namespace": "_types.aggregations" } }, - "kind": "interface", "name": { "name": "UntypedAggregationRange", "namespace": "_types.aggregations" }, "properties": [], - "specLocation": "_types/aggregations/bucket.ts#L679-L679" + "specLocation": "_types/aggregations/bucket.ts#L693-L693" }, { ->>>>>>> 9fd43f8ed (making range aggregation untagged union) + "kind": "interface", "description": "Value count aggregation result. `value` is always present.", "extDocId": "search-aggregations-metrics-valuecount-aggregation", "extDocUrl": "https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics-valuecount-aggregation.html", @@ -69018,23 +68401,7 @@ } } ], -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - "specLocation": "_types/aggregations/bucket.ts#L1091-L1115" -======= - "specLocation": "_types/aggregations/bucket.ts#L1037-L1058" ->>>>>>> 9fd43f8ed (making range aggregation untagged union) -======= - "specLocation": "_types/aggregations/bucket.ts#L1025-L1046" ->>>>>>> 07886ab3f (same as range query) -======= - "specLocation": "_types/aggregations/bucket.ts#L1021-L1042" ->>>>>>> 1f832eff5 (removed term range aggregation) -======= - "specLocation": "_types/aggregations/bucket.ts#L1025-L1046" ->>>>>>> 985e70b37 (Revert "removed term range aggregation") + "specLocation": "_types/aggregations/bucket.ts#L1088-L1112" }, { "kind": "interface", diff --git a/output/typescript/types.ts b/output/typescript/types.ts index bd2e84a3a0..a45c0f0203 100644 --- a/output/typescript/types.ts +++ b/output/typescript/types.ts @@ -3174,31 +3174,12 @@ export interface AggregationsAggregationContainer { variable_width_histogram?: AggregationsVariableWidthHistogramAggregation } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -export interface AggregationsAggregationRange { - from?: double | null - key?: string - to?: double | null -======= -export type AggregationsAggregationRange = AggregationsUntypedAggregationRange | AggregationsNumberAggregationRange | AggregationsStringAggregationRange -======= -export type AggregationsAggregationRange = AggregationsUntypedAggregationRange | AggregationsDateAggregationRange | AggregationsNumberAggregationRange | AggregationsTermAggregationRange ->>>>>>> 07886ab3f (same as range query) -======= -export type AggregationsAggregationRange = AggregationsUntypedAggregationRange | AggregationsDateAggregationRange | AggregationsNumberAggregationRange ->>>>>>> 1f832eff5 (removed term range aggregation) -======= export type AggregationsAggregationRange = AggregationsUntypedAggregationRange | AggregationsDateAggregationRange | AggregationsNumberAggregationRange | AggregationsTermAggregationRange ->>>>>>> 985e70b37 (Revert "removed term range aggregation") export interface AggregationsAggregationRangeBase { from?: T key?: string to?: T ->>>>>>> 9fd43f8ed (making range aggregation untagged union) } export interface AggregationsArrayPercentilesItem {