diff --git a/output/schema/schema.json b/output/schema/schema.json
index 92c067b0cf..46dbf2ae54 100644
--- a/output/schema/schema.json
+++ b/output/schema/schema.json
@@ -38465,11 +38465,7 @@
             "value": {
               "kind": "array_of",
               "value": {
-                "kind": "instance_of",
-                "type": {
-                  "name": "FieldValue",
-                  "namespace": "_types"
-                }
+                "kind": "user_defined_value"
               }
             }
           }
@@ -38574,7 +38570,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/hits.ts#L41-L66"
+      "specLocation": "_global/search/_types/hits.ts#L40-L65"
     },
     {
       "kind": "interface",
@@ -38660,7 +38656,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/hits.ts#L68-L74"
+      "specLocation": "_global/search/_types/hits.ts#L67-L73"
     },
     {
       "kind": "interface",
@@ -38867,7 +38863,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/hits.ts#L108-L142"
+      "specLocation": "_global/search/_types/hits.ts#L107-L141"
     },
     {
       "kind": "interface",
@@ -38893,7 +38889,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/hits.ts#L86-L88"
+      "specLocation": "_global/search/_types/hits.ts#L85-L87"
     },
     {
       "kind": "interface",
@@ -39455,7 +39451,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/hits.ts#L90-L94"
+      "specLocation": "_global/search/_types/hits.ts#L89-L93"
     },
     {
       "kind": "interface",
@@ -41365,7 +41361,7 @@
           }
         }
       ],
-      "specLocation": "_global/search/_types/hits.ts#L96-L99"
+      "specLocation": "_global/search/_types/hits.ts#L95-L98"
     },
     {
       "kind": "enum",
@@ -41383,7 +41379,7 @@
         "name": "TotalHitsRelation",
         "namespace": "_global.search._types"
       },
-      "specLocation": "_global/search/_types/hits.ts#L101-L106"
+      "specLocation": "_global/search/_types/hits.ts#L100-L105"
     },
     {
       "kind": "type_alias",
@@ -41396,7 +41392,7 @@
         "name": "TrackHits",
         "namespace": "_global.search._types"
       },
-      "specLocation": "_global/search/_types/hits.ts#L144-L152",
+      "specLocation": "_global/search/_types/hits.ts#L143-L151",
       "type": {
         "kind": "union_of",
         "items": [
@@ -45048,7 +45044,7 @@
         "name": "AggregateName",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L148-L152",
+      "specLocation": "_types/common.ts#L142-L146",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -45257,7 +45253,7 @@
         "name": "ByteSize",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L96-L97",
+      "specLocation": "_types/common.ts#L90-L91",
       "type": {
         "kind": "union_of",
         "items": [
@@ -45310,7 +45306,7 @@
         "name": "Bytes",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L172-L184"
+      "specLocation": "_types/common.ts#L166-L178"
     },
     {
       "kind": "type_alias",
@@ -45318,7 +45314,7 @@
         "name": "CategoryId",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L58-L58",
+      "specLocation": "_types/common.ts#L52-L52",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -45333,7 +45329,7 @@
         "name": "ClusterAlias",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L78-L78",
+      "specLocation": "_types/common.ts#L72-L72",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -45453,7 +45449,7 @@
         "name": "ClusterInfoTarget",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L384-L390"
+      "specLocation": "_types/common.ts#L378-L384"
     },
     {
       "kind": "type_alias",
@@ -45461,7 +45457,7 @@
         "name": "ClusterInfoTargets",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L392-L392",
+      "specLocation": "_types/common.ts#L386-L386",
       "type": {
         "kind": "union_of",
         "items": [
@@ -45680,7 +45676,7 @@
         "name": "Conflicts",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L186-L195"
+      "specLocation": "_types/common.ts#L180-L189"
     },
     {
       "kind": "interface",
@@ -45811,7 +45807,7 @@
         "name": "DataStreamName",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L92-L92",
+      "specLocation": "_types/common.ts#L86-L86",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -45826,7 +45822,7 @@
         "name": "DataStreamNames",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L94-L94",
+      "specLocation": "_types/common.ts#L88-L88",
       "type": {
         "kind": "union_of",
         "items": [
@@ -46263,7 +46259,7 @@
         "namespace": "_types"
       },
       "properties": [],
-      "specLocation": "_types/common.ts#L163-L164"
+      "specLocation": "_types/common.ts#L157-L158"
     },
     {
       "kind": "type_alias",
@@ -46475,7 +46471,7 @@
         "name": "ExpandWildcard",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L204-L218"
+      "specLocation": "_types/common.ts#L198-L212"
     },
     {
       "kind": "type_alias",
@@ -46483,7 +46479,7 @@
         "name": "ExpandWildcards",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L220-L220",
+      "specLocation": "_types/common.ts#L214-L214",
       "type": {
         "kind": "union_of",
         "items": [
@@ -46514,7 +46510,7 @@
         "name": "Field",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L141-L142",
+      "specLocation": "_types/common.ts#L135-L136",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -46704,15 +46700,14 @@
         "double",
         "string",
         "boolean",
-        "null",
-        "any"
+        "null"
       ],
       "description": "A field value.",
       "name": {
         "name": "FieldValue",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L25-L37",
+      "specLocation": "_types/common.ts#L25-L31",
       "type": {
         "kind": "union_of",
         "items": [
@@ -46750,9 +46745,6 @@
               "name": "null",
               "namespace": "_builtins"
             }
-          },
-          {
-            "kind": "user_defined_value"
           }
         ]
       }
@@ -46828,7 +46820,7 @@
         "name": "Fields",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L143-L143",
+      "specLocation": "_types/common.ts#L137-L137",
       "type": {
         "kind": "union_of",
         "items": [
@@ -46923,7 +46915,7 @@
         "name": "Fuzziness",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L136-L137",
+      "specLocation": "_types/common.ts#L130-L131",
       "type": {
         "kind": "union_of",
         "items": [
@@ -47530,7 +47522,7 @@
         "name": "GrokPattern",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L87-L87",
+      "specLocation": "_types/common.ts#L81-L81",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -47568,7 +47560,7 @@
         "name": "HealthStatus",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L222-L242"
+      "specLocation": "_types/common.ts#L216-L236"
     },
     {
       "kind": "type_alias",
@@ -47591,7 +47583,7 @@
         "name": "HttpHeaders",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L161-L161",
+      "specLocation": "_types/common.ts#L155-L155",
       "type": {
         "kind": "dictionary_of",
         "key": {
@@ -47664,7 +47656,7 @@
         "name": "Id",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L61-L61",
+      "specLocation": "_types/common.ts#L55-L55",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -47679,7 +47671,7 @@
         "name": "Ids",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L62-L62",
+      "specLocation": "_types/common.ts#L56-L56",
       "type": {
         "kind": "union_of",
         "items": [
@@ -47709,7 +47701,7 @@
         "name": "IndexAlias",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L68-L68",
+      "specLocation": "_types/common.ts#L62-L62",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -47724,7 +47716,7 @@
         "name": "IndexName",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L66-L66",
+      "specLocation": "_types/common.ts#L60-L60",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -47739,7 +47731,7 @@
         "name": "IndexPattern",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L69-L69",
+      "specLocation": "_types/common.ts#L63-L63",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -47754,7 +47746,7 @@
         "name": "IndexPatterns",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L70-L70",
+      "specLocation": "_types/common.ts#L64-L64",
       "type": {
         "kind": "array_of",
         "value": {
@@ -47985,7 +47977,7 @@
         "name": "Indices",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L67-L67",
+      "specLocation": "_types/common.ts#L61-L61",
       "type": {
         "kind": "union_of",
         "items": [
@@ -48068,7 +48060,7 @@
           }
         }
       ],
-      "specLocation": "_types/common.ts#L338-L365"
+      "specLocation": "_types/common.ts#L332-L359"
     },
     {
       "kind": "interface",
@@ -48211,7 +48203,7 @@
           }
         }
       ],
-      "specLocation": "_types/common.ts#L323-L336"
+      "specLocation": "_types/common.ts#L317-L330"
     },
     {
       "kind": "type_alias",
@@ -48682,7 +48674,7 @@
         "name": "Level",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L252-L256"
+      "specLocation": "_types/common.ts#L246-L250"
     },
     {
       "kind": "enum",
@@ -48937,7 +48929,7 @@
         "name": "Metadata",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L99-L99",
+      "specLocation": "_types/common.ts#L93-L93",
       "type": {
         "kind": "dictionary_of",
         "key": {
@@ -48959,7 +48951,7 @@
         "name": "Metrics",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L76-L76",
+      "specLocation": "_types/common.ts#L70-L70",
       "type": {
         "kind": "union_of",
         "items": [
@@ -48992,7 +48984,7 @@
         "name": "MinimumShouldMatch",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L166-L170",
+      "specLocation": "_types/common.ts#L160-L164",
       "type": {
         "kind": "union_of",
         "items": [
@@ -49021,7 +49013,7 @@
         "name": "MultiTermQueryRewrite",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L138-L139",
+      "specLocation": "_types/common.ts#L132-L133",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -49036,7 +49028,7 @@
         "name": "Name",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L80-L80",
+      "specLocation": "_types/common.ts#L74-L74",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -49051,7 +49043,7 @@
         "name": "Names",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L81-L81",
+      "specLocation": "_types/common.ts#L75-L75",
       "type": {
         "kind": "union_of",
         "items": [
@@ -49081,7 +49073,7 @@
         "name": "Namespace",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L83-L83",
+      "specLocation": "_types/common.ts#L77-L77",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -49231,7 +49223,7 @@
         "name": "NodeId",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L63-L63",
+      "specLocation": "_types/common.ts#L57-L57",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -49246,7 +49238,7 @@
         "name": "NodeIds",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L64-L64",
+      "specLocation": "_types/common.ts#L58-L58",
       "type": {
         "kind": "union_of",
         "items": [
@@ -49278,7 +49270,7 @@
         "name": "NodeName",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L89-L90",
+      "specLocation": "_types/common.ts#L83-L84",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -49614,7 +49606,7 @@
         "name": "OpType",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L258-L267"
+      "specLocation": "_types/common.ts#L252-L261"
     },
     {
       "kind": "type_alias",
@@ -49622,7 +49614,7 @@
         "name": "Password",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L198-L198",
+      "specLocation": "_types/common.ts#L192-L192",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -49664,7 +49656,7 @@
         "name": "PipelineName",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L86-L86",
+      "specLocation": "_types/common.ts#L80-L80",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -49791,7 +49783,7 @@
         "name": "PropertyName",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L133-L133",
+      "specLocation": "_types/common.ts#L127-L127",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -50118,7 +50110,7 @@
         "name": "Refresh",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L269-L276"
+      "specLocation": "_types/common.ts#L263-L270"
     },
     {
       "kind": "interface",
@@ -50220,7 +50212,7 @@
         "name": "RelationName",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L134-L134",
+      "specLocation": "_types/common.ts#L128-L128",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -50545,7 +50537,7 @@
         "name": "Routing",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L72-L72",
+      "specLocation": "_types/common.ts#L66-L66",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -50671,7 +50663,7 @@
         "name": "ScalarValue",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L39-L43",
+      "specLocation": "_types/common.ts#L33-L37",
       "type": {
         "kind": "union_of",
         "items": [
@@ -51034,7 +51026,7 @@
         "name": "ScrollId",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L55-L55",
+      "specLocation": "_types/common.ts#L49-L49",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -51049,7 +51041,7 @@
         "name": "ScrollIds",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L56-L56",
+      "specLocation": "_types/common.ts#L50-L50",
       "type": {
         "kind": "union_of",
         "items": [
@@ -51376,7 +51368,7 @@
         "name": "SearchType",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L278-L283"
+      "specLocation": "_types/common.ts#L272-L277"
     },
     {
       "kind": "interface",
@@ -51691,7 +51683,7 @@
         "name": "SequenceNumber",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L131-L131",
+      "specLocation": "_types/common.ts#L125-L125",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -51706,7 +51698,7 @@
         "name": "Service",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L84-L84",
+      "specLocation": "_types/common.ts#L78-L78",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -51926,7 +51918,7 @@
         "name": "Slices",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L367-L372",
+      "specLocation": "_types/common.ts#L361-L366",
       "type": {
         "kind": "union_of",
         "items": [
@@ -51959,7 +51951,7 @@
         "name": "SlicesCalculation",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L374-L382"
+      "specLocation": "_types/common.ts#L368-L376"
     },
     {
       "kind": "type_alias",
@@ -52422,7 +52414,7 @@
         "name": "SuggestMode",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L285-L298"
+      "specLocation": "_types/common.ts#L279-L292"
     },
     {
       "kind": "type_alias",
@@ -52431,7 +52423,7 @@
         "name": "SuggestionName",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L154-L158",
+      "specLocation": "_types/common.ts#L148-L152",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -52500,7 +52492,7 @@
         "name": "TaskId",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L135-L135",
+      "specLocation": "_types/common.ts#L129-L129",
       "type": {
         "kind": "union_of",
         "items": [
@@ -52652,7 +52644,7 @@
         "name": "ThreadType",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L300-L306"
+      "specLocation": "_types/common.ts#L294-L300"
     },
     {
       "kind": "type_alias",
@@ -53008,7 +53000,7 @@
         "name": "Username",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L197-L197",
+      "specLocation": "_types/common.ts#L191-L191",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -53023,7 +53015,7 @@
         "name": "Uuid",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L128-L128",
+      "specLocation": "_types/common.ts#L122-L122",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -53038,7 +53030,7 @@
         "name": "VersionNumber",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L102-L102",
+      "specLocation": "_types/common.ts#L96-L96",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -53053,7 +53045,7 @@
         "name": "VersionString",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L104-L104",
+      "specLocation": "_types/common.ts#L98-L98",
       "type": {
         "kind": "instance_of",
         "type": {
@@ -53086,7 +53078,7 @@
         "name": "VersionType",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L106-L125"
+      "specLocation": "_types/common.ts#L100-L119"
     },
     {
       "kind": "enum",
@@ -53102,7 +53094,7 @@
         "name": "WaitForActiveShardOptions",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L308-L312"
+      "specLocation": "_types/common.ts#L302-L306"
     },
     {
       "kind": "type_alias",
@@ -53114,7 +53106,7 @@
         "name": "WaitForActiveShards",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L145-L146",
+      "specLocation": "_types/common.ts#L139-L140",
       "type": {
         "kind": "union_of",
         "items": [
@@ -53161,7 +53153,7 @@
         "name": "WaitForEvents",
         "namespace": "_types"
       },
-      "specLocation": "_types/common.ts#L314-L321"
+      "specLocation": "_types/common.ts#L308-L315"
     },
     {
       "kind": "interface",
diff --git a/output/typescript/types.ts b/output/typescript/types.ts
index 3e53dc2c7f..7e7b7c662d 100644
--- a/output/typescript/types.ts
+++ b/output/typescript/types.ts
@@ -1545,7 +1545,7 @@ export interface SearchHit<TDocument = unknown> {
   matched_queries?: string[] | Record<string, double>
   _nested?: SearchNestedIdentity
   _ignored?: string[]
-  ignored_field_values?: Record<string, FieldValue[]>
+  ignored_field_values?: Record<string, any[]>
   _shard?: string
   _node?: string
   _routing?: string
@@ -2361,7 +2361,7 @@ export interface FieldSort {
 
 export type FieldSortNumericType = 'long' | 'double' | 'date' | 'date_nanos'
 
-export type FieldValue = long | double | string | boolean | null | any
+export type FieldValue = long | double | string | boolean | null
 
 export interface FielddataStats {
   evictions?: long
diff --git a/specification/_global/search/_types/hits.ts b/specification/_global/search/_types/hits.ts
index 2ab7993d8f..02cc0678cb 100644
--- a/specification/_global/search/_types/hits.ts
+++ b/specification/_global/search/_types/hits.ts
@@ -23,7 +23,6 @@ import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import {
   Field,
   Fields,
-  FieldValue,
   Id,
   IndexName,
   Name,
@@ -53,7 +52,7 @@ export class Hit<TDocument> {
   matched_queries?: string[] | Dictionary<string, double>
   _nested?: NestedIdentity
   _ignored?: string[]
-  ignored_field_values?: Dictionary<string, FieldValue[]>
+  ignored_field_values?: Dictionary<string, UserDefinedValue[]>
   _shard?: string
   _node?: string
   _routing?: string
diff --git a/specification/_types/common.ts b/specification/_types/common.ts
index 3f81a3adc4..73847e459e 100644
--- a/specification/_types/common.ts
+++ b/specification/_types/common.ts
@@ -24,17 +24,11 @@ import { double, integer, long } from './Numeric'
 
 /**
  * A field value.
- * @codegen_names long, double, string, boolean, null, any
+ * @codegen_names long, double, string, boolean, null
  */
 // Note: the ending `UserDefinedValue` includes all other union members, but we keep them explicit so that
 // code generators can provide direct access to scalar values, which are the most common use case.
-export type FieldValue =
-  | long
-  | double
-  | string
-  | boolean
-  | null
-  | UserDefinedValue
+export type FieldValue = long | double | string | boolean | null
 
 /**
  * A scalar value.