From 9e4e16572e45d9176fd04e94b75c49fefe7c84d3 Mon Sep 17 00:00:00 2001 From: Quentin Pradet Date: Wed, 20 Sep 2023 10:27:43 +0400 Subject: [PATCH] Fix include/exclude type in Frequent Items agg (#2280) --- output/schema/schema.json | 50 +++++---------------- output/typescript/types.ts | 4 +- specification/_types/aggregations/bucket.ts | 4 +- 3 files changed, 14 insertions(+), 44 deletions(-) diff --git a/output/schema/schema.json b/output/schema/schema.json index 2c6d0cfe17..d2e65cd235 100644 --- a/output/schema/schema.json +++ b/output/schema/schema.json @@ -52323,26 +52323,11 @@ "name": "exclude", "required": false, "type": { - "items": [ - { - "kind": "instance_of", - "type": { - "name": "string", - "namespace": "_builtins" - } - }, - { - "kind": "array_of", - "value": { - "kind": "instance_of", - "type": { - "name": "string", - "namespace": "_builtins" - } - } - } - ], - "kind": "union_of" + "kind": "instance_of", + "type": { + "name": "TermsExclude", + "namespace": "_types.aggregations" + } } }, { @@ -52350,26 +52335,11 @@ "name": "include", "required": false, "type": { - "items": [ - { - "kind": "instance_of", - "type": { - "name": "string", - "namespace": "_builtins" - } - }, - { - "kind": "array_of", - "value": { - "kind": "instance_of", - "type": { - "name": "string", - "namespace": "_builtins" - } - } - } - ], - "kind": "union_of" + "kind": "instance_of", + "type": { + "name": "TermsInclude", + "namespace": "_types.aggregations" + } } } ], diff --git a/output/typescript/types.ts b/output/typescript/types.ts index f5369efa92..0ef3a1019f 100644 --- a/output/typescript/types.ts +++ b/output/typescript/types.ts @@ -3309,8 +3309,8 @@ export type AggregationsFrequentItemSetsBucket = AggregationsFrequentItemSetsBuc export interface AggregationsFrequentItemSetsField { field: Field - exclude?: string | string[] - include?: string | string[] + exclude?: AggregationsTermsExclude + include?: AggregationsTermsInclude } export type AggregationsGapPolicy = 'skip' | 'insert_zeros' | 'keep_values' diff --git a/specification/_types/aggregations/bucket.ts b/specification/_types/aggregations/bucket.ts index f429759537..743817b12a 100644 --- a/specification/_types/aggregations/bucket.ts +++ b/specification/_types/aggregations/bucket.ts @@ -1148,12 +1148,12 @@ export class FrequentItemSetsField { * Values to exclude. * Can be regular expression strings or arrays of strings of exact terms. */ - exclude?: string | string[] + exclude?: TermsExclude /** * Values to include. * Can be regular expression strings or arrays of strings of exact terms. */ - include?: string | string[] + include?: TermsInclude } export class FrequentItemSetsAggregation {