WIP - Added polyfill for what will be added in next client.

src/Foundatio.Parsers.ElasticQueries/ElasticMappingResolver.cs

@@ -92,7 +92,7 @@ public FieldMapping GetMapping(string field, bool followAlias = false)
                 if (currentProperties != null)
                     fieldMapping = ((IDictionary<PropertyName, IProperty>)currentProperties).Values.FirstOrDefault(m =>
                     {
-                        string propertyName = _inferrer.PropertyName(m?.Name);
+                        string propertyName = _inferrer.PropertyName(m?.TryGetName());
                         return propertyName != null && propertyName.Equals(fieldPart, StringComparison.OrdinalIgnoreCase);
                     });
 
@@ -125,13 +125,14 @@ public FieldMapping GetMapping(string field, bool followAlias = false)
             }
 
             // coded properties sometimes have null Name properties
-            if (fieldMapping.Name == null && fieldMapping is IPropertyWithClrOrigin clrOrigin && clrOrigin.ClrOrigin != null)
-                fieldMapping.Name = new PropertyName(clrOrigin.ClrOrigin);
+            string name = fieldMapping.TryGetName();
+            if (name == null && fieldMapping is IPropertyWithClrOrigin clrOrigin && clrOrigin.ClrOrigin != null)
+                name = new PropertyName(clrOrigin.ClrOrigin);
 
             if (depth == 0)
-                resolvedFieldName += _inferrer.PropertyName(fieldMapping.Name);
+                resolvedFieldName += _inferrer.PropertyName(name);
             else
-                resolvedFieldName += "." + _inferrer.PropertyName(fieldMapping.Name);
+                resolvedFieldName += "." + _inferrer.PropertyName(name);
 
             if (depth == fieldParts.Length - 1)
             {
@@ -415,7 +416,7 @@ private Properties MergeProperties(Properties codeProperties, Properties serverP
 
                     mergedCodeProperties[kvp.Key] = new FieldAliasProperty
                     {
-                        Meta = aliasProperty.Meta,
+                        //LocalMetadata = aliasProperty.LocalMetadata,
                         Path = _inferrer?.Field(aliasProperty.Path) ?? aliasProperty.Path,
                         Name = aliasProperty.Name
                     };
@@ -431,19 +432,23 @@ private Properties MergeProperties(Properties codeProperties, Properties serverP
         foreach (var serverProperty in serverProperties)
         {
             var merged = serverProperty.Value;
-            if (mergedCodeProperties.TryGetProperty(serverProperty.Key, out var codeProperty))
-                merged.LocalMetadata = codeProperty.LocalMetadata;
+            // if (mergedCodeProperties.TryGetProperty(serverProperty.Key, out var codeProperty))
+            //     merged.LocalMetadata = codeProperty.LocalMetadata;
 
-            switch (merged)
+            if (mergedCodeProperties.TryGetProperty(serverProperty.Key, out var codeProperty))
             {
-                case ObjectProperty objectProperty:
-                    var codeObjectProperty = codeProperty as ObjectProperty;
-                    objectProperty.Properties = MergeProperties(codeObjectProperty?.Properties, objectProperty.Properties);
-                    break;
-                case TextProperty textProperty:
-                    var codeTextProperty = codeProperty as TextProperty;
-                    textProperty.Fields = MergeProperties(codeTextProperty?.Fields, textProperty.Fields);
-                    break;
+                switch (merged)
+                {
+                    case ObjectProperty objectProperty:
+                        var codeObjectProperty = codeProperty as ObjectProperty;
+                        objectProperty.Properties =
+                            MergeProperties(codeObjectProperty?.Properties, objectProperty.Properties);
+                        break;
+                    case TextProperty textProperty:
+                        var codeTextProperty = codeProperty as TextProperty;
+                        textProperty.Fields = MergeProperties(codeTextProperty?.Fields, textProperty.Fields);
+                        break;
+                }
             }
 
             properties.Add(serverProperty.Key, merged);

src/Foundatio.Parsers.ElasticQueries/Extensions/ElasticExtensions.cs

@@ -8,13 +8,20 @@
 using System.Threading.Tasks;
 using Elastic.Clients.Elasticsearch;
 using Elastic.Clients.Elasticsearch.Aggregations;
+using Elastic.Clients.Elasticsearch.Mapping;
 using Elastic.Transport.Products.Elasticsearch;
 using Microsoft.Extensions.Logging;
 
 namespace Foundatio.Parsers.ElasticQueries.Extensions;
 
 public static class ElasticExtensions
 {
+    public static string TryGetName(this IProperty property)
+    {
+        // TODO until: https://github.com/elastic/elasticsearch-net/issues/8336
+        return null;
+    }
+
     public static TermsInclude AddValue(this TermsInclude include, string value)
     {
         if (include?.Values == null)

src/Foundatio.Parsers.ElasticQueries/Visitors/CombineQueriesVisitor.cs

@@ -26,8 +26,7 @@ public override async Task VisitAsync(GroupNode node, IQueryVisitorContext conte
 
         Query query = await node.GetQueryAsync(() => node.GetDefaultQueryAsync(context)).ConfigureAwait(false);
         Query container = query;
-        var nested = query as NestedQuery;
-        if (nested != null && node.Parent != null)
+        if (query.TryGet<NestedQuery>(out var nested) && node.Parent != null)
             container = null;
 
         foreach (var child in node.Children.OfType<IFieldQueryNode>())

src/Foundatio.Parsers.ElasticQueries/Visitors/GetSortFieldsVisitor.cs

@@ -18,7 +18,7 @@ public override void Visit(TermNode node, IQueryVisitorContext context)
             return;
 
         var sort = node.GetSort(() => node.GetDefaultSort(context));
-        if (sort.AdditionalPropertyName == null)
+        if (sort.SortKey == null)
             return;
 
         _fields.Add(sort);