CSHARP-5572: Standardize on using existing IsTuple and IsValueTuple helper methods

Author: rstam

src/MongoDB.Driver/Linq/Linq3Implementation/Reflection/TupleOrValueTupleConstructor.cs

@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-using System;
 using System.Reflection;
+using MongoDB.Driver.Linq.Linq3Implementation.Misc;
 
 namespace MongoDB.Driver.Linq.Linq3Implementation.Reflection;
 
@@ -24,8 +24,6 @@ public static bool IsTupleOrValueTupleConstructor(ConstructorInfo constructor)
     {
         return
             constructor != null &&
-            constructor.DeclaringType is var declaringType &&
-            declaringType.Namespace == "System" &&
-            (declaringType.Name.StartsWith("Tuple") || declaringType.Name.StartsWith("ValueTuple"));
+            constructor.DeclaringType.IsTupleOrValueTuple();
     }
 }

src/MongoDB.Driver/Linq/Linq3Implementation/SerializerFinders/SerializerFinderVisitMember.cs

@@ -52,7 +52,7 @@ _ when IsCollectionCountOrLengthProperty() => GetCollectionCountOrLengthProperty
                     _ when declaringType.IsConstructedGenericType && declaringType.GetGenericTypeDefinition() == typeof(Dictionary<,>) => GetDictionaryPropertySerializer(),
                     _ when declaringType.IsConstructedGenericType && declaringType.GetGenericTypeDefinition() == typeof(IDictionary<,>) => GetIDictionaryPropertySerializer(),
                     _ when declaringType.IsNullable() => GetNullablePropertySerializer(),
-                    _ when IsTupleOrValueTuple(declaringType) => GetTupleOrValueTuplePropertySerializer(),
+                    _ when declaringType.IsTupleOrValueTuple() => GetTupleOrValueTuplePropertySerializer(),
                     _ => GetPropertySerializer()
                 };
 
@@ -230,15 +230,5 @@ bool IsCollectionCountOrLengthProperty()
                 node.Type == typeof(int) &&
                 (member.Name == "Count" || member.Name == "Length");
         }
-
-        bool IsTupleOrValueTuple(Type type)
-        {
-            return
-                type.Namespace == "System" &&
-                (type.Name.StartsWith("Tuple") || type.Name.StartsWith("ValueTuple")) &&
-                type.IsPublic &&
-                type.IsConstructedGenericType &&
-                type.GetGenericArguments().Length is >= 1 and <= 8;
-        }
     }
 }

src/MongoDB.Driver/Linq/Linq3Implementation/SerializerFinders/SerializerFinderVisitMethodCall.cs

@@ -14,8 +14,6 @@
  */
 
 using System;
-using System.CodeDom;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
@@ -28,7 +26,6 @@
 using MongoDB.Driver.Linq.Linq3Implementation.Misc;
 using MongoDB.Driver.Linq.Linq3Implementation.Reflection;
 using MongoDB.Driver.Linq.Linq3Implementation.Serializers;
-using MongoDB.Driver.Linq.Linq3Implementation.Translators.ExpressionToAggregationExpressionTranslators;
 
 namespace MongoDB.Driver.Linq.Linq3Implementation.SerializerFinders;
 
@@ -1717,19 +1714,20 @@ void DeduceCreateMethodSerializers()
 
                 if (IsNotKnown(node) && AreAllKnown(arguments, out var argumentSerializers))
                 {
+                    var tupleType = method.ReturnType;
+
                     if (arguments.Count == 8)
                     {
-                        var tempList = new List<IBsonSerializer>(argumentSerializers);
-                        tempList[7] = method.ReturnType.Name.StartsWith("ValueTuple") ?
-                            ValueTupleSerializer.Create([argumentSerializers[7]]) :
-                            TupleSerializer.Create([argumentSerializers[7]]);
-                        argumentSerializers = tempList;
+                        var item8Expression = arguments[7];
+                        var item8Type = item8Expression.Type;
+                        var item8Serializer = argumentSerializers[7];
+                        var restTupleType = (tupleType.IsTuple() ? typeof(Tuple<>) : typeof(ValueTuple<>)).MakeGenericType(item8Type);
+                        var restSerializer = TupleOrValueTupleSerializer.Create(restTupleType, [item8Serializer]);
+                        argumentSerializers = argumentSerializers.Take(7).Append(restSerializer).ToArray();
                     }
 
-                    var resultSerializer = method.ReturnType.Name.StartsWith("ValueTuple") ?
-                        ValueTupleSerializer.Create(argumentSerializers) :
-                        TupleSerializer.Create(argumentSerializers);
-                    AddNodeSerializer(node, resultSerializer);
+                    var tupleSerializer = TupleOrValueTupleSerializer.Create(tupleType, argumentSerializers);
+                    AddNodeSerializer(node, tupleSerializer);
                 }
             }
             else

src/MongoDB.Driver/Linq/Linq3Implementation/Serializers/TupleOrValueTupleSerializer.cs

@@ -17,18 +17,19 @@
 using System.Collections.Generic;
 using MongoDB.Bson.Serialization;
 using MongoDB.Bson.Serialization.Serializers;
+using MongoDB.Driver.Linq.Linq3Implementation.Misc;
 
 namespace MongoDB.Driver.Linq.Linq3Implementation.Serializers;
 
 internal static class TupleOrValueTupleSerializer
 {
-    public static IBsonSerializer Create(Type type, IEnumerable<IBsonSerializer> itemSerializers)
+    public static IBsonSerializer Create(Type tupleType, IEnumerable<IBsonSerializer> itemSerializers)
     {
-        return type.Name switch
+        return tupleType.Name switch
         {
-            _ when type.Name.StartsWith("Tuple") => TupleSerializer.Create(itemSerializers),
-            _ when type.Name.StartsWith("ValueTuple") => ValueTupleSerializer.Create(itemSerializers),
-            _ => throw new ArgumentException($"Unexpected type: {type.Name}", nameof(type))
+            _ when tupleType.IsTuple() => TupleSerializer.Create(itemSerializers),
+            _ when tupleType.IsValueTuple() => ValueTupleSerializer.Create(itemSerializers),
+            _ => throw new ArgumentException($"Unexpected tuple type: {tupleType.Name}", nameof(tupleType))
         };
     }
 }

src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/NewTupleExpressionToAggregationExpressionTranslator.cs

@@ -13,13 +13,11 @@
 * limitations under the License.
 */
 
-using System;
-using System.Collections.Generic;
 using System.Linq.Expressions;
 using MongoDB.Bson.Serialization;
-using MongoDB.Bson.Serialization.Serializers;
 using MongoDB.Driver.Linq.Linq3Implementation.Ast.Expressions;
 using MongoDB.Driver.Linq.Linq3Implementation.Misc;
+using MongoDB.Driver.Linq.Linq3Implementation.Serializers;
 
 namespace MongoDB.Driver.Linq.Linq3Implementation.Translators.ExpressionToAggregationExpressionTranslators
 {
@@ -49,16 +47,11 @@ public static TranslatedExpression Translate(TranslationContext context, NewExpr
                 }
 
                 var ast = AstExpression.ComputedArray(items);
-                var tupleSerializer = CreateTupleSerializer(tupleType, itemSerializers);
+                var tupleSerializer = TupleOrValueTupleSerializer.Create(tupleType, itemSerializers);
                 return new TranslatedExpression(expression, ast, tupleSerializer);
             }
 
             throw new ExpressionNotSupportedException(expression);
         }
-
-        private static IBsonSerializer CreateTupleSerializer(Type tupleType, IEnumerable<IBsonSerializer> itemSerializers)
-        {
-            return tupleType.IsTuple() ? TupleSerializer.Create(itemSerializers) : ValueTupleSerializer.Create(itemSerializers);
-        }
     }
 }