Move back to built in ID (#774)

Author: SimonCropp

docs/configuration.md

@@ -485,7 +485,7 @@ public class GraphQlControllerTests
     public async Task Single()
     {
         var query = @"
-query ($id: Id!)
+query ($id: ID!)
 {
   company(id:$id)
   {
@@ -506,7 +506,7 @@ query ($id: Id!)
     public async Task Single_not_found()
     {
         var query = @"
-query ($id: Id!)
+query ($id: ID!)
 {
   company(id:$id)
   {
@@ -527,7 +527,7 @@ query ($id: Id!)
     public async Task Variable()
     {
         var query = @"
-query ($id: Id!)
+query ($id: ID!)
 {
   companies(ids:[$id])
   {

docs/defining-graphs.md

@@ -74,7 +74,7 @@ public class Query :
     }
 }
 ```
-<sup><a href='/src/Snippets/RootQuery.cs#L5-L22' title='Snippet source file'>snippet source</a> | <a href='#snippet-rootquery' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Snippets/RootQuery.cs#L3-L20' title='Snippet source file'>snippet source</a> | <a href='#snippet-rootquery' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 `AddQueryField` will result in all matching being found and returned.

src/Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;NU5104;CS1573</NoWarn>
-    <Version>20.2.1</Version>
+    <Version>21.0.0</Version>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <PackageTags>EntityFrameworkCore, EntityFramework, GraphQL</PackageTags>
     <ImplicitUsings>true</ImplicitUsings>

src/GraphQL.EntityFramework/EfGraphQLConventions.cs

@@ -83,7 +83,6 @@ static void RegisterScalarsAndArgs(IServiceCollection services)
         services.AddSingleton<WhereExpressionGraph>();
         services.AddSingleton<OrderByGraph>();
         services.AddSingleton<ComparisonGraph>();
-        services.AddSingleton<IdGraph>();
         services.AddSingleton<ConnectorGraph>();
     }
 

src/GraphQL.EntityFramework/GraphApi/EfInterfaceGraphType.cs

@@ -47,15 +47,4 @@ public TDbContext ResolveDbContext(IResolveFieldContext<TSource> context) =>
 
     public TDbContext ResolveDbContext(IResolveFieldContext context) =>
         GraphQlService.ResolveDbContext(context);
-
-    public override FieldBuilder<TSource, TProperty> Field<TProperty>(
-        string name,
-        Expression<Func<TSource, TProperty>> expression,
-        bool nullable = false,
-        Type? type = null)
-    {
-        OverrideIdAttribute.Convert<TProperty>(ref type);
-
-        return base.Field(name, expression, nullable, type);
-    }
 }

src/GraphQL.EntityFramework/GraphApi/EfObjectGraphType.cs

@@ -71,15 +71,4 @@ public FieldBuilder<TSource, TReturn> AddSingleField<TReturn>(
         bool nullable = false)
         where TReturn : class =>
         GraphQlService.AddSingleField(this, name, resolve, mutate, graphType,  nullable);
-
-    public override FieldBuilder<TSource, TProperty> Field<TProperty>(
-        string name,
-        Expression<Func<TSource, TProperty>> expression,
-        bool nullable = false,
-        Type? type = null)
-    {
-        OverrideIdAttribute.Convert<TProperty>(ref type);
-
-        return base.Field(name, expression, nullable, type);
-    }
 }

src/GraphQL.EntityFramework/Mapping/Mapper.cs

@@ -219,10 +219,6 @@ static Type GraphTypeFromType(string name, Type propertyType, bool isNullable)
     {
         try
         {
-            if (OverrideIdAttribute.TryGetIdType(propertyType, out var graphType))
-            {
-                return graphType;
-            }
             if (propertyType.TryGetCollectionType(out var collectionGenericType))
             {
                 if (isNullable)

src/GraphQL.EntityFramework/OverrideIdAttribute.cs

@@ -23,26 +23,39 @@ string ArgumentToExpression(object argument)
             };
         }
 
-        var idsArgument = context.GetArgument(typeof(object), "ids");
-        var idArgument = context.GetArgument(typeof(object), "id");
-        if (idsArgument is null && idArgument is null)
+        if (context.Arguments == null)
+        {
+            result = null;
+            return false;
+        }
+
+        var containsIds = context.Arguments.TryGetValue("ids", out var ids);
+        var containsId = context.Arguments.TryGetValue("id", out var id);
+
+        if (!containsIds && !containsId)
+        {
+            result = null;
+            return false;
+        }
+
+        if (ids.Source == ArgumentSource.FieldDefault && id.Source == ArgumentSource.FieldDefault)
         {
             result = null;
             return false;
         }
 
         var expressions = new List<string>();
 
-        if (idArgument is not null)
+        if (id.Source != ArgumentSource.FieldDefault)
         {
-            expressions.Add( ArgumentToExpression(idArgument));
+            expressions.Add(ArgumentToExpression(id.Value!));
         }
 
-        if (idsArgument is not null)
+        if (ids.Source != ArgumentSource.FieldDefault)
         {
-            if (idsArgument is not IEnumerable<object> objCollection)
+            if (ids.Value is not IEnumerable<object> objCollection)
             {
-                throw new($"TryReadIds got an 'ids' argument of type '{idsArgument.GetType().FullName}' which is not supported.");
+                throw new($"TryReadIds got an 'ids' argument of type '{ids.Value!.GetType().FullName}' which is not supported.");
             }
 
             expressions.AddRange(objCollection.Select(ArgumentToExpression));
@@ -62,6 +75,7 @@ public static bool TryReadSkip(IResolveFieldContext context, out int skip)
                 throw new("Skip cannot be less than 0.");
             }
         }
+
         return result;
     }
 
@@ -75,6 +89,7 @@ public static bool TryReadTake(IResolveFieldContext context, out int take)
                 throw new("Take cannot be less than 0.");
             }
         }
+
         return result;
     }
 
@@ -98,7 +113,7 @@ static bool TryReadInt(string name, IResolveFieldContext context, out int value)
             return false;
         }
 
-        value = (int)argument;
+        value = (int) argument;
         return true;
     }
 }

src/GraphQL.EntityFramework/Where/ArgumentReader.cs

@@ -12,13 +12,13 @@ static QueryArgument<ListGraphType<NonNullGraphType<OrderByGraph>>> OrderByArgum
             Name = "orderBy"
         };
 
-    static QueryArgument<ListGraphType<NonNullGraphType<IdGraph>>> IdsArgument() =>
+    static QueryArgument<ListGraphType<NonNullGraphType<IdGraphType>>> IdsArgument() =>
         new()
         {
             Name = "ids"
         };
 
-    static QueryArgument<IdGraph> IdArgument() =>
+    static QueryArgument<IdGraphType> IdArgument() =>
         new()
         {
             Name = "id"