resolve merge conflicts

docs/search-core.address.md

@@ -4,7 +4,7 @@
 
 ## Address interface
 
-A type interface with address fields to use in [FieldValueDirectAnswer.value](./search-core.fieldvaluedirectanswer.value.md)<!-- -->.
+A type interface with address fields to use in [DirectAnswer.value](./search-core.directanswer.value.md)<!-- -->.
 
 <b>Signature:</b>
 

docs/search-core.addressdirectanswer.md

@@ -4,14 +4,14 @@
 
 ## AddressDirectAnswer interface
 
-An interface for direct answers for a [FieldValueDirectAnswer](./search-core.fieldvaluedirectanswer.md) with address values.
+An interface for direct answers for a [DirectAnswer](./search-core.directanswer.md) with address values.
 
 <b>Signature:</b>
 
 ```typescript
-export interface AddressDirectAnswer extends FieldValueDirectAnswer<Address> 
+export interface AddressDirectAnswer extends DirectAnswer<Address> 
 ```
-<b>Extends:</b> [FieldValueDirectAnswer](./search-core.fieldvaluedirectanswer.md)<!-- -->&lt;[Address](./search-core.address.md)<!-- -->&gt;
+<b>Extends:</b> [DirectAnswer](./search-core.directanswer.md)<!-- -->&lt;[Address](./search-core.address.md)<!-- -->&gt;
 
 ## Properties
 

docs/search-core.fieldvaluedirectanswer.entityname.md → docs/search-core.basefieldvaluedirectanswer.entityname.md

@@ -1,8 +1,8 @@
 <!-- Do not edit this file. It is automatically generated by API Documenter. -->
 
-[Home](./index.md) &gt; [@yext/search-core](./search-core.md) &gt; [FieldValueDirectAnswer](./search-core.fieldvaluedirectanswer.md) &gt; [entityName](./search-core.fieldvaluedirectanswer.entityname.md)
+[Home](./index.md) &gt; [@yext/search-core](./search-core.md) &gt; [BaseFieldValueDirectAnswer](./search-core.basefieldvaluedirectanswer.md) &gt; [entityName](./search-core.basefieldvaluedirectanswer.entityname.md)
 
-## FieldValueDirectAnswer.entityName property
+## BaseFieldValueDirectAnswer.entityName property
 
 The name of the entity that direct answer came from.
 

docs/search-core.fieldvaluedirectanswer.fieldapiname.md → docs/search-core.basefieldvaluedirectanswer.fieldapiname.md

@@ -1,8 +1,8 @@
 <!-- Do not edit this file. It is automatically generated by API Documenter. -->
 
-[Home](./index.md) &gt; [@yext/search-core](./search-core.md) &gt; [FieldValueDirectAnswer](./search-core.fieldvaluedirectanswer.md) &gt; [fieldApiName](./search-core.fieldvaluedirectanswer.fieldapiname.md)
+[Home](./index.md) &gt; [@yext/search-core](./search-core.md) &gt; [BaseFieldValueDirectAnswer](./search-core.basefieldvaluedirectanswer.md) &gt; [fieldApiName](./search-core.basefieldvaluedirectanswer.fieldapiname.md)
 
-## FieldValueDirectAnswer.fieldApiName property
+## BaseFieldValueDirectAnswer.fieldApiName property
 
 The field api name of the direct answer.
 

docs/search-core.fieldvaluedirectanswer.fieldname.md → docs/search-core.basefieldvaluedirectanswer.fieldname.md

@@ -1,8 +1,8 @@
 <!-- Do not edit this file. It is automatically generated by API Documenter. -->
 
-[Home](./index.md) &gt; [@yext/search-core](./search-core.md) &gt; [FieldValueDirectAnswer](./search-core.fieldvaluedirectanswer.md) &gt; [fieldName](./search-core.fieldvaluedirectanswer.fieldname.md)
+[Home](./index.md) &gt; [@yext/search-core](./search-core.md) &gt; [BaseFieldValueDirectAnswer](./search-core.basefieldvaluedirectanswer.md) &gt; [fieldName](./search-core.basefieldvaluedirectanswer.fieldname.md)
 
-## FieldValueDirectAnswer.fieldName property
+## BaseFieldValueDirectAnswer.fieldName property
 
 The field name of the direct answer.
 

docs/search-core.basefieldvaluedirectanswer.md

@@ -0,0 +1,25 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [@yext/search-core](./search-core.md) &gt; [BaseFieldValueDirectAnswer](./search-core.basefieldvaluedirectanswer.md)
+
+## BaseFieldValueDirectAnswer interface
+
+A direct answer where the answer came from a field from the knowledge graph.
+
+<b>Signature:</b>
+
+```typescript
+export interface BaseFieldValueDirectAnswer<T = unknown> extends DirectAnswer<T> 
+```
+<b>Extends:</b> [DirectAnswer](./search-core.directanswer.md)<!-- -->&lt;T&gt;
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [entityName](./search-core.basefieldvaluedirectanswer.entityname.md) | string | The name of the entity that direct answer came from. |
+|  [fieldApiName](./search-core.basefieldvaluedirectanswer.fieldapiname.md) | string | The field api name of the direct answer. |
+|  [fieldName](./search-core.basefieldvaluedirectanswer.fieldname.md) | string | The field name of the direct answer. |
+|  [type](./search-core.basefieldvaluedirectanswer.type.md) | [DirectAnswerType.FieldValue](./search-core.directanswertype.md) | [DirectAnswerType](./search-core.directanswertype.md)<!-- -->.FieldValue. |
+|  [value](./search-core.basefieldvaluedirectanswer.value.md) | T | The result of the direct answer. |
+

docs/search-core.fieldvaluedirectanswer.type.md → docs/search-core.basefieldvaluedirectanswer.type.md

@@ -1,8 +1,8 @@
 <!-- Do not edit this file. It is automatically generated by API Documenter. -->
 
-[Home](./index.md) &gt; [@yext/search-core](./search-core.md) &gt; [FieldValueDirectAnswer](./search-core.fieldvaluedirectanswer.md) &gt; [type](./search-core.fieldvaluedirectanswer.type.md)
+[Home](./index.md) &gt; [@yext/search-core](./search-core.md) &gt; [BaseFieldValueDirectAnswer](./search-core.basefieldvaluedirectanswer.md) &gt; [type](./search-core.basefieldvaluedirectanswer.type.md)
 
-## FieldValueDirectAnswer.type property
+## BaseFieldValueDirectAnswer.type property
 
 [DirectAnswerType](./search-core.directanswertype.md)<!-- -->.FieldValue.
 

docs/search-core.basefieldvaluedirectanswer.value.md

@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [@yext/search-core](./search-core.md) &gt; [BaseFieldValueDirectAnswer](./search-core.basefieldvaluedirectanswer.md) &gt; [value](./search-core.basefieldvaluedirectanswer.value.md)
+
+## BaseFieldValueDirectAnswer.value property
+
+The result of the direct answer.
+
+<b>Signature:</b>
+
+```typescript
+value: T;
+```

docs/search-core.builtinfieldtype.md

@@ -17,4 +17,7 @@ export declare enum BuiltInFieldType
 |  Member | Value | Description |
 |  --- | --- | --- |
 |  Address | <code>&quot;address&quot;</code> |  |
+|  MultiLineText | <code>&quot;multi_line_text&quot;</code> |  |
+|  Phone | <code>&quot;phone&quot;</code> |  |
+|  RichText | <code>&quot;rich_text&quot;</code> |  |
 

docs/search-core.conjunctionstaticfilter.combinator.md

@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [@yext/search-core](./search-core.md) &gt; [ConjunctionStaticFilter](./search-core.conjunctionstaticfilter.md) &gt; [combinator](./search-core.conjunctionstaticfilter.combinator.md)
+
+## ConjunctionStaticFilter.combinator property
+
+Indicates that filters should be combined with a logical AND.
+
+<b>Signature:</b>
+
+```typescript
+combinator: FilterCombinator.AND;
+```

docs/search-core.conjunctionstaticfilter.filters.md

@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [@yext/search-core](./search-core.md) &gt; [ConjunctionStaticFilter](./search-core.conjunctionstaticfilter.md) &gt; [filters](./search-core.conjunctionstaticfilter.filters.md)
+
+## ConjunctionStaticFilter.filters property
+
+The filters to combine together.
+
+<b>Signature:</b>
+
+```typescript
+filters: StaticFilter[];
+```

docs/search-core.conjunctionstaticfilter.kind.md

@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [@yext/search-core](./search-core.md) &gt; [ConjunctionStaticFilter](./search-core.conjunctionstaticfilter.md) &gt; [kind](./search-core.conjunctionstaticfilter.kind.md)
+
+## ConjunctionStaticFilter.kind property
+
+The kind of static filter.
+
+<b>Signature:</b>
+
+```typescript
+kind: 'conjunction';
+```

docs/search-core.conjunctionstaticfilter.md

@@ -0,0 +1,22 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [@yext/search-core](./search-core.md) &gt; [ConjunctionStaticFilter](./search-core.conjunctionstaticfilter.md)
+
+## ConjunctionStaticFilter interface
+
+A static filter composed by combining other static filters with the logical AND operator.
+
+<b>Signature:</b>
+
+```typescript
+export interface ConjunctionStaticFilter 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [combinator](./search-core.conjunctionstaticfilter.combinator.md) | [FilterCombinator.AND](./search-core.filtercombinator.md) | Indicates that filters should be combined with a logical AND. |
+|  [filters](./search-core.conjunctionstaticfilter.filters.md) | [StaticFilter](./search-core.staticfilter.md)<!-- -->\[\] | The filters to combine together. |
+|  [kind](./search-core.conjunctionstaticfilter.kind.md) | 'conjunction' | The kind of static filter. |
+

docs/search-core.directanswer.fieldtype.md

@@ -9,5 +9,5 @@ The field type of the direct answer.
 <b>Signature:</b>
 
 ```typescript
-fieldType: BuiltInFieldType | string;
+fieldType: EnumOrLiteral<BuiltInFieldType> | 'unknown';
 ```

docs/search-core.directanswer.md

@@ -16,9 +16,9 @@ export interface DirectAnswer<T = unknown>
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [fieldType](./search-core.directanswer.fieldtype.md) | [BuiltInFieldType](./search-core.builtinfieldtype.md) \| string | The field type of the direct answer. |
+|  [fieldType](./search-core.directanswer.fieldtype.md) | [EnumOrLiteral](./search-core.enumorliteral.md)<!-- -->&lt;[BuiltInFieldType](./search-core.builtinfieldtype.md)<!-- -->&gt; \| 'unknown' | The field type of the direct answer. |
 |  [relatedResult](./search-core.directanswer.relatedresult.md) | [Result](./search-core.result.md) | The entity associated with the direct answer. |
 |  [type](./search-core.directanswer.type.md) | [DirectAnswerType](./search-core.directanswertype.md) | The [DirectAnswerType](./search-core.directanswertype.md)<!-- -->. |
-|  [value?](./search-core.directanswer.value.md) | T | <i>(Optional)</i> The result of the direct answer. |
+|  [value?](./search-core.directanswer.value.md) | T | <i>(Optional)</i> The value of the direct answer. |
 |  [verticalKey](./search-core.directanswer.verticalkey.md) | string | The vertical key of the direct answer. |
 

docs/search-core.directanswer.value.md

@@ -4,7 +4,7 @@
 
 ## DirectAnswer.value property
 
-The result of the direct answer.
+The value of the direct answer.
 
 <b>Signature:</b>
 
@@ -14,5 +14,5 @@ value?: T;
 
 ## Remarks
 
-A value will not be present if the [DirectAnswer.fieldType](./search-core.directanswer.fieldtype.md) is 'rich\_text'.
+A value will not be present if the [DirectAnswer.type](./search-core.directanswer.type.md) is 'FEATURED\_SNIPPET' and [DirectAnswer.fieldType](./search-core.directanswer.fieldtype.md) is 'rich\_text'.
 

docs/search-core.disjunctionstaticfilter.combinator.md

@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [@yext/search-core](./search-core.md) &gt; [DisjunctionStaticFilter](./search-core.disjunctionstaticfilter.md) &gt; [combinator](./search-core.disjunctionstaticfilter.combinator.md)
+
+## DisjunctionStaticFilter.combinator property
+
+Indicates that filters should be combined with a logical OR.
+
+<b>Signature:</b>
+
+```typescript
+combinator: FilterCombinator.OR;
+```

docs/search-core.disjunctionstaticfilter.filters.md

@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [@yext/search-core](./search-core.md) &gt; [DisjunctionStaticFilter](./search-core.disjunctionstaticfilter.md) &gt; [filters](./search-core.disjunctionstaticfilter.filters.md)
+
+## DisjunctionStaticFilter.filters property
+
+The filters to combine together.
+
+<b>Signature:</b>
+
+```typescript
+filters: (DisjunctionStaticFilter | FieldValueStaticFilter)[];
+```

docs/search-core.disjunctionstaticfilter.kind.md

@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [@yext/search-core](./search-core.md) &gt; [DisjunctionStaticFilter](./search-core.disjunctionstaticfilter.md) &gt; [kind](./search-core.disjunctionstaticfilter.kind.md)
+
+## DisjunctionStaticFilter.kind property
+
+The kind of static filter.
+
+<b>Signature:</b>
+
+```typescript
+kind: 'disjunction';
+```

docs/search-core.disjunctionstaticfilter.md

@@ -0,0 +1,22 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [@yext/search-core](./search-core.md) &gt; [DisjunctionStaticFilter](./search-core.disjunctionstaticfilter.md)
+
+## DisjunctionStaticFilter interface
+
+A static filter composed by combining filters with the logical OR operator. The combined filters can either be field value filters or other disjunction filters.
+
+<b>Signature:</b>
+
+```typescript
+export interface DisjunctionStaticFilter 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [combinator](./search-core.disjunctionstaticfilter.combinator.md) | [FilterCombinator.OR](./search-core.filtercombinator.md) | Indicates that filters should be combined with a logical OR. |
+|  [filters](./search-core.disjunctionstaticfilter.filters.md) | ([DisjunctionStaticFilter](./search-core.disjunctionstaticfilter.md) \| [FieldValueStaticFilter](./search-core.fieldvaluestaticfilter.md)<!-- -->)\[\] | The filters to combine together. |
+|  [kind](./search-core.disjunctionstaticfilter.kind.md) | 'disjunction' | The kind of static filter. |
+

docs/search-core.enumorliteral.md

@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [@yext/search-core](./search-core.md) &gt; [EnumOrLiteral](./search-core.enumorliteral.md)
+
+## EnumOrLiteral type
+
+Produces a union type from the enum passed as a generic which consists of the enum values and the string literals of the enum.
+
+<b>Signature:</b>
+
+```typescript
+export declare type EnumOrLiteral<T extends string> = T | `${T}`;
+```

docs/search-core.featuredsnippetdirectanswer.fieldtype.md

@@ -9,5 +9,5 @@ The field type of the direct answer.
 <b>Signature:</b>
 
 ```typescript
-fieldType: BuiltInFieldType | string;
+fieldType: BuiltInFieldType.MultiLineText | BuiltInFieldType.RichText;
 ```

docs/search-core.featuredsnippetdirectanswer.md

@@ -17,10 +17,7 @@ export interface FeaturedSnippetDirectAnswer<T = unknown> extends DirectAnswer<T
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [fieldType](./search-core.featuredsnippetdirectanswer.fieldtype.md) | [BuiltInFieldType](./search-core.builtinfieldtype.md) \| string | The field type of the direct answer. |
-|  [relatedResult](./search-core.featuredsnippetdirectanswer.relatedresult.md) | [Result](./search-core.result.md) | The entity associated with the direct answer. |
+|  [fieldType](./search-core.featuredsnippetdirectanswer.fieldtype.md) | [BuiltInFieldType.MultiLineText](./search-core.builtinfieldtype.md) \| [BuiltInFieldType.RichText](./search-core.builtinfieldtype.md) | The field type of the direct answer. |
 |  [snippet](./search-core.featuredsnippetdirectanswer.snippet.md) | [Snippet](./search-core.snippet.md) | The snippet where the direct answer was found. |
-|  [type](./search-core.featuredsnippetdirectanswer.type.md) | [DirectAnswerType.FeaturedSnippet](./search-core.directanswertype.md) | [DirectAnswerType](./search-core.directanswertype.md)<!-- -->.FeaturedSnippet. |
-|  [value?](./search-core.featuredsnippetdirectanswer.value.md) | T | <i>(Optional)</i> The result of the direct answer. |
-|  [verticalKey](./search-core.featuredsnippetdirectanswer.verticalkey.md) | string | The vertical key of the direct answer. |
+|  [type](./search-core.featuredsnippetdirectanswer.type.md) | [DirectAnswerType.FeaturedSnippet](./search-core.directanswertype.md) | [DirectAnswerType](./search-core.directanswertype.md)<!-- -->.FeaturedSnippet |
 

docs/search-core.featuredsnippetdirectanswer.type.md

@@ -4,7 +4,7 @@
 
 ## FeaturedSnippetDirectAnswer.type property
 
-[DirectAnswerType](./search-core.directanswertype.md)<!-- -->.FeaturedSnippet.
+[DirectAnswerType](./search-core.directanswertype.md)<!-- -->.FeaturedSnippet
 
 <b>Signature:</b>