diff --git a/output/schema/schema.json b/output/schema/schema.json
index ddc92b1066..31d131c9ac 100644
--- a/output/schema/schema.json
+++ b/output/schema/schema.json
@@ -24780,7 +24780,7 @@
         }
       ],
       "shortcutProperty": "context",
-      "specLocation": "_global/search/_types/suggester.ts#L153-L160"
+      "specLocation": "_global/search/_types/suggester.ts#L155-L162"
     },
     {
       "generics": [
@@ -24805,27 +24805,48 @@
           "name": "options",
           "required": true,
           "type": {
-            "kind": "array_of",
-            "value": {
-              "generics": [
-                {
+            "items": [
+              {
+                "generics": [
+                  {
+                    "kind": "instance_of",
+                    "type": {
+                      "name": "TDocument",
+                      "namespace": "_global.search._types"
+                    }
+                  }
+                ],
+                "kind": "instance_of",
+                "type": {
+                  "name": "CompletionSuggestOption",
+                  "namespace": "_global.search._types"
+                }
+              },
+              {
+                "kind": "array_of",
+                "value": {
+                  "generics": [
+                    {
+                      "kind": "instance_of",
+                      "type": {
+                        "name": "TDocument",
+                        "namespace": "_global.search._types"
+                      }
+                    }
+                  ],
                   "kind": "instance_of",
                   "type": {
-                    "name": "TDocument",
+                    "name": "CompletionSuggestOption",
                     "namespace": "_global.search._types"
                   }
                 }
-              ],
-              "kind": "instance_of",
-              "type": {
-                "name": "CompletionSuggestOption",
-                "namespace": "_global.search._types"
               }
-            }
+            ],
+            "kind": "union_of"
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L49-L54",
+      "specLocation": "_global/search/_types/suggester.ts#L49-L56",
       "variantName": "completion"
     },
     {
@@ -24984,7 +25005,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L72-L84"
+      "specLocation": "_global/search/_types/suggester.ts#L74-L86"
     },
     {
       "inherits": {
@@ -25081,7 +25102,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L127-L133"
+      "specLocation": "_global/search/_types/suggester.ts#L129-L135"
     },
     {
       "codegenNames": [
@@ -25095,7 +25116,7 @@
         "name": "Context",
         "namespace": "_global.search._types"
       },
-      "specLocation": "_global/search/_types/suggester.ts#L145-L151",
+      "specLocation": "_global/search/_types/suggester.ts#L147-L153",
       "type": {
         "items": [
           {
@@ -25245,7 +25266,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L164-L176"
+      "specLocation": "_global/search/_types/suggester.ts#L166-L178"
     },
     {
       "kind": "interface",
@@ -25572,7 +25593,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L103-L117",
+      "specLocation": "_global/search/_types/suggester.ts#L105-L119",
       "variants": {
         "kind": "container",
         "nonExhaustive": true
@@ -26591,7 +26612,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L210-L212"
+      "specLocation": "_global/search/_types/suggester.ts#L212-L214"
     },
     {
       "kind": "interface",
@@ -26634,7 +26655,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L214-L218"
+      "specLocation": "_global/search/_types/suggester.ts#L216-L220"
     },
     {
       "kind": "interface",
@@ -26696,15 +26717,30 @@
           "name": "options",
           "required": true,
           "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "PhraseSuggestOption",
-              "namespace": "_global.search._types"
-            }
+            "items": [
+              {
+                "kind": "instance_of",
+                "type": {
+                  "name": "PhraseSuggestOption",
+                  "namespace": "_global.search._types"
+                }
+              },
+              {
+                "kind": "array_of",
+                "value": {
+                  "kind": "instance_of",
+                  "type": {
+                    "name": "PhraseSuggestOption",
+                    "namespace": "_global.search._types"
+                  }
+                }
+              }
+            ],
+            "kind": "union_of"
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L56-L61",
+      "specLocation": "_global/search/_types/suggester.ts#L58-L63",
       "variantName": "phrase"
     },
     {
@@ -26755,7 +26791,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L178-L182"
+      "specLocation": "_global/search/_types/suggester.ts#L180-L184"
     },
     {
       "kind": "interface",
@@ -26787,7 +26823,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L184-L187"
+      "specLocation": "_global/search/_types/suggester.ts#L186-L189"
     },
     {
       "kind": "interface",
@@ -26819,7 +26855,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L205-L208"
+      "specLocation": "_global/search/_types/suggester.ts#L207-L210"
     },
     {
       "kind": "interface",
@@ -26862,7 +26898,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L86-L90"
+      "specLocation": "_global/search/_types/suggester.ts#L88-L92"
     },
     {
       "inherits": {
@@ -27024,7 +27060,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L189-L203"
+      "specLocation": "_global/search/_types/suggester.ts#L191-L205"
     },
     {
       "kind": "interface",
@@ -27620,7 +27656,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L222-L229",
+      "specLocation": "_global/search/_types/suggester.ts#L224-L231",
       "variants": {
         "kind": "container"
       }
@@ -27751,7 +27787,7 @@
         "name": "StringDistance",
         "namespace": "_global.search._types"
       },
-      "specLocation": "_global/search/_types/suggester.ts#L237-L243"
+      "specLocation": "_global/search/_types/suggester.ts#L239-L245"
     },
     {
       "kind": "interface",
@@ -27772,7 +27808,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L231-L233"
+      "specLocation": "_global/search/_types/suggester.ts#L233-L235"
     },
     {
       "generics": [
@@ -27932,7 +27968,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L135-L141"
+      "specLocation": "_global/search/_types/suggester.ts#L137-L143"
     },
     {
       "kind": "enum",
@@ -27948,7 +27984,7 @@
         "name": "SuggestSort",
         "namespace": "_global.search._types"
       },
-      "specLocation": "_global/search/_types/suggester.ts#L245-L248"
+      "specLocation": "_global/search/_types/suggester.ts#L247-L250"
     },
     {
       "attachedBehaviors": [
@@ -27997,7 +28033,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L98-L101"
+      "specLocation": "_global/search/_types/suggester.ts#L100-L103"
     },
     {
       "kind": "interface",
@@ -28040,7 +28076,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L119-L123"
+      "specLocation": "_global/search/_types/suggester.ts#L121-L125"
     },
     {
       "inherits": {
@@ -28059,15 +28095,30 @@
           "name": "options",
           "required": true,
           "type": {
-            "kind": "instance_of",
-            "type": {
-              "name": "TermSuggestOption",
-              "namespace": "_global.search._types"
-            }
+            "items": [
+              {
+                "kind": "instance_of",
+                "type": {
+                  "name": "TermSuggestOption",
+                  "namespace": "_global.search._types"
+                }
+              },
+              {
+                "kind": "array_of",
+                "value": {
+                  "kind": "instance_of",
+                  "type": {
+                    "name": "TermSuggestOption",
+                    "namespace": "_global.search._types"
+                  }
+                }
+              }
+            ],
+            "kind": "union_of"
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L63-L68",
+      "specLocation": "_global/search/_types/suggester.ts#L65-L70",
       "variantName": "term"
     },
     {
@@ -28111,7 +28162,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L92-L96"
+      "specLocation": "_global/search/_types/suggester.ts#L94-L98"
     },
     {
       "inherits": {
@@ -28259,7 +28310,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L250-L263"
+      "specLocation": "_global/search/_types/suggester.ts#L252-L265"
     },
     {
       "kind": "interface",
@@ -51803,7 +51854,7 @@
         },
         {
           "name": "mappings",
-          "required": true,
+          "required": false,
           "type": {
             "kind": "array_of",
             "value": {
diff --git a/output/typescript/types.ts b/output/typescript/types.ts
index d52bb30894..14f4be9953 100644
--- a/output/typescript/types.ts
+++ b/output/typescript/types.ts
@@ -1144,7 +1144,7 @@ export interface SearchCompletionContext {
 }
 
 export interface SearchCompletionSuggest<TDocument = unknown> extends SearchSuggestBase {
-  options: SearchCompletionSuggestOption<TDocument>[]
+  options: SearchCompletionSuggestOption<TDocument> | SearchCompletionSuggestOption<TDocument>[]
 }
 
 export interface SearchCompletionSuggestOption<TDocument = unknown> {
@@ -1335,7 +1335,7 @@ export interface SearchNestedIdentity {
 }
 
 export interface SearchPhraseSuggest extends SearchSuggestBase {
-  options: SearchPhraseSuggestOption
+  options: SearchPhraseSuggestOption | SearchPhraseSuggestOption[]
 }
 
 export interface SearchPhraseSuggestCollate {
@@ -1495,7 +1495,7 @@ export interface SearchSuggesterBase {
 }
 
 export interface SearchTermSuggest extends SearchSuggestBase {
-  options: SearchTermSuggestOption
+  options: SearchTermSuggestOption | SearchTermSuggestOption[]
 }
 
 export interface SearchTermSuggestOption {
@@ -4085,7 +4085,7 @@ export interface AnalysisLowercaseTokenizer extends AnalysisTokenizerBase {
 
 export interface AnalysisMappingCharFilter extends AnalysisCharFilterBase {
   type: 'mapping'
-  mappings: string[]
+  mappings?: string[]
   mappings_path?: string
 }
 
diff --git a/specification/_global/search/_types/suggester.ts b/specification/_global/search/_types/suggester.ts
index ee0961c864..a683c0af51 100644
--- a/specification/_global/search/_types/suggester.ts
+++ b/specification/_global/search/_types/suggester.ts
@@ -50,21 +50,23 @@ export class SuggestBase {
  * @variant name=completion
  */
 export class CompletionSuggest<TDocument> extends SuggestBase {
-  options: CompletionSuggestOption<TDocument>[]
+  options:
+    | CompletionSuggestOption<TDocument>
+    | CompletionSuggestOption<TDocument>[]
 }
 
 /**
  * @variant name=phrase
  */
 export class PhraseSuggest extends SuggestBase {
-  options: PhraseSuggestOption
+  options: PhraseSuggestOption | PhraseSuggestOption[]
 }
 
 /**
  * @variant name=term
  */
 export class TermSuggest extends SuggestBase {
-  options: TermSuggestOption
+  options: TermSuggestOption | TermSuggestOption[]
 }
 
 // In the ES code a nested Hit object is expanded inline. Not all Hit fields have been
diff --git a/specification/_types/analysis/char_filters.ts b/specification/_types/analysis/char_filters.ts
index 8c94158de9..c0d17cc833 100644
--- a/specification/_types/analysis/char_filters.ts
+++ b/specification/_types/analysis/char_filters.ts
@@ -46,7 +46,7 @@ export class HtmlStripCharFilter extends CharFilterBase {
 
 export class MappingCharFilter extends CharFilterBase {
   type: 'mapping'
-  mappings: string[]
+  mappings?: string[]
   mappings_path?: string
 }