diff --git a/output/schema/schema.json b/output/schema/schema.json
index e2a0f9a95b..c8981e6296 100644
--- a/output/schema/schema.json
+++ b/output/schema/schema.json
@@ -25421,7 +25421,7 @@
         }
       ],
       "shortcutProperty": "context",
-      "specLocation": "_global/search/_types/suggester.ts#L150-L157"
+      "specLocation": "_global/search/_types/suggester.ts#L152-L159"
     },
     {
       "generics": [
@@ -25446,27 +25446,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#L48-L53",
+      "specLocation": "_global/search/_types/suggester.ts#L48-L55",
       "variantName": "completion"
     },
     {
@@ -25614,7 +25635,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L71-L82"
+      "specLocation": "_global/search/_types/suggester.ts#L73-L84"
     },
     {
       "inherits": {
@@ -25711,7 +25732,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L125-L131"
+      "specLocation": "_global/search/_types/suggester.ts#L127-L133"
     },
     {
       "codegenNames": [
@@ -25726,7 +25747,7 @@
         "name": "Context",
         "namespace": "_global.search._types"
       },
-      "specLocation": "_global/search/_types/suggester.ts#L143-L148",
+      "specLocation": "_global/search/_types/suggester.ts#L145-L150",
       "type": {
         "items": [
           {
@@ -25876,7 +25897,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L161-L173"
+      "specLocation": "_global/search/_types/suggester.ts#L163-L175"
     },
     {
       "kind": "interface",
@@ -26223,7 +26244,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L101-L115",
+      "specLocation": "_global/search/_types/suggester.ts#L103-L117",
       "variants": {
         "kind": "container",
         "nonExhaustive": true
@@ -27270,7 +27291,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L207-L209"
+      "specLocation": "_global/search/_types/suggester.ts#L209-L211"
     },
     {
       "kind": "interface",
@@ -27313,7 +27334,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L211-L215"
+      "specLocation": "_global/search/_types/suggester.ts#L213-L217"
     },
     {
       "kind": "interface",
@@ -27375,15 +27396,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#L55-L60",
+      "specLocation": "_global/search/_types/suggester.ts#L57-L62",
       "variantName": "phrase"
     },
     {
@@ -27434,7 +27470,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L175-L179"
+      "specLocation": "_global/search/_types/suggester.ts#L177-L181"
     },
     {
       "kind": "interface",
@@ -27466,7 +27502,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L181-L184"
+      "specLocation": "_global/search/_types/suggester.ts#L183-L186"
     },
     {
       "kind": "interface",
@@ -27498,7 +27534,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L202-L205"
+      "specLocation": "_global/search/_types/suggester.ts#L204-L207"
     },
     {
       "kind": "interface",
@@ -27541,7 +27577,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L84-L88"
+      "specLocation": "_global/search/_types/suggester.ts#L86-L90"
     },
     {
       "inherits": {
@@ -27703,7 +27739,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L186-L200"
+      "specLocation": "_global/search/_types/suggester.ts#L188-L202"
     },
     {
       "kind": "interface",
@@ -28308,7 +28344,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L219-L226",
+      "specLocation": "_global/search/_types/suggester.ts#L221-L228",
       "variants": {
         "kind": "container"
       }
@@ -28439,7 +28475,7 @@
         "name": "StringDistance",
         "namespace": "_global.search._types"
       },
-      "specLocation": "_global/search/_types/suggester.ts#L234-L240"
+      "specLocation": "_global/search/_types/suggester.ts#L236-L242"
     },
     {
       "kind": "interface",
@@ -28460,7 +28496,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L228-L230"
+      "specLocation": "_global/search/_types/suggester.ts#L230-L232"
     },
     {
       "generics": [
@@ -28620,7 +28656,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L133-L139"
+      "specLocation": "_global/search/_types/suggester.ts#L135-L141"
     },
     {
       "kind": "enum",
@@ -28636,7 +28672,7 @@
         "name": "SuggestSort",
         "namespace": "_global.search._types"
       },
-      "specLocation": "_global/search/_types/suggester.ts#L242-L245"
+      "specLocation": "_global/search/_types/suggester.ts#L244-L247"
     },
     {
       "attachedBehaviors": [
@@ -28685,7 +28721,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L96-L99"
+      "specLocation": "_global/search/_types/suggester.ts#L98-L101"
     },
     {
       "kind": "interface",
@@ -28728,7 +28764,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L117-L121"
+      "specLocation": "_global/search/_types/suggester.ts#L119-L123"
     },
     {
       "inherits": {
@@ -28747,15 +28783,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#L62-L67",
+      "specLocation": "_global/search/_types/suggester.ts#L64-L69",
       "variantName": "term"
     },
     {
@@ -28799,7 +28850,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L90-L94"
+      "specLocation": "_global/search/_types/suggester.ts#L92-L96"
     },
     {
       "inherits": {
@@ -28947,7 +28998,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/suggester.ts#L247-L260"
+      "specLocation": "_global/search/_types/suggester.ts#L249-L262"
     },
     {
       "kind": "interface",
@@ -53539,7 +53590,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 6758673bb7..6592ea9697 100644
--- a/output/typescript/types.ts
+++ b/output/typescript/types.ts
@@ -1152,7 +1152,7 @@ export interface SearchCompletionContext {
 }
 
 export interface SearchCompletionSuggest<TDocument = unknown> extends SearchSuggestBase {
-  options: SearchCompletionSuggestOption<TDocument>[]
+  options: SearchCompletionSuggestOption<TDocument> | SearchCompletionSuggestOption<TDocument>[]
 }
 
 export interface SearchCompletionSuggestOption<TDocument = unknown> {
@@ -1343,7 +1343,7 @@ export interface SearchNestedIdentity {
 }
 
 export interface SearchPhraseSuggest extends SearchSuggestBase {
-  options: SearchPhraseSuggestOption
+  options: SearchPhraseSuggestOption | SearchPhraseSuggestOption[]
 }
 
 export interface SearchPhraseSuggestCollate {
@@ -1503,7 +1503,7 @@ export interface SearchSuggesterBase {
 }
 
 export interface SearchTermSuggest extends SearchSuggestBase {
-  options: SearchTermSuggestOption
+  options: SearchTermSuggestOption | SearchTermSuggestOption[]
 }
 
 export interface SearchTermSuggestOption {
@@ -4170,7 +4170,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 5efe9f1ff3..cb75ac8e07 100644
--- a/specification/_global/search/_types/suggester.ts
+++ b/specification/_global/search/_types/suggester.ts
@@ -49,21 +49,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
 }