Refined unignore for V10

src/Core/Types/Types/Descriptors/Contracts/IDirectiveArgumentDescriptor.cs

@@ -36,6 +36,6 @@ IDirectiveArgumentDescriptor Type<TInputType>(TInputType inputType)
 
         IDirectiveArgumentDescriptor DefaultValue(object value);
 
-        IDirectiveArgumentDescriptor Ignore();
+        IDirectiveArgumentDescriptor Ignore(bool ignore = true);
     }
 }

src/Core/Types/Types/Descriptors/Contracts/IInputFieldDescriptor.cs

@@ -25,7 +25,7 @@ IInputFieldDescriptor Type<TInputType>(TInputType inputType)
 
         IInputFieldDescriptor Type(Type type);
 
-        IInputFieldDescriptor Ignore();
+        IInputFieldDescriptor Ignore(bool ignore = true);
 
         IInputFieldDescriptor DefaultValue(IValueNode value);
 

src/Core/Types/Types/Descriptors/Contracts/IObjectTypeDescriptor~1.cs

@@ -174,6 +174,4 @@ IObjectTypeDescriptor<T> Directive(
             NameString name,
             params ArgumentNode[] arguments);
     }
-
-
 }

src/Core/Types/Types/Descriptors/DirectiveArgumentDescriptor.cs

@@ -110,9 +110,9 @@ public IDirectiveArgumentDescriptor Name(
             return this;
         }
 
-        public IDirectiveArgumentDescriptor Ignore()
+        public IDirectiveArgumentDescriptor Ignore(bool ignore)
         {
-            Definition.Ignore = true;
+            Definition.Ignore = ignore;
             return this;
         }
 

src/Core/Types/Types/Descriptors/DirectiveTypeDescriptor.cs

@@ -99,7 +99,10 @@ public IDirectiveTypeDescriptor Description(string value)
         public IDirectiveArgumentDescriptor Argument(NameString name)
         {
             DirectiveArgumentDescriptor descriptor =
-                Arguments.FirstOrDefault(t => t.Definition.Name.Equals(name));
+                Arguments.FirstOrDefault(t =>
+                    t.Definition.Name.Equals(name)
+                    && !t.Definition.Ignore);
+
             if (descriptor is { })
             {
                 return descriptor;

src/Core/Types/Types/Descriptors/DirectiveTypeDescriptor~1.cs

@@ -43,8 +43,6 @@ protected override void OnCompleteArguments(
             base.OnCompleteArguments(arguments, handledProperties);
         }
 
-
-
         #region IDirectiveDescriptor<T>
 
         public new IDirectiveTypeDescriptor<T> SyntaxNode(

src/Core/Types/Types/Descriptors/Extensions/DirectiveTypeDescriptorExtensions.cs

@@ -1,14 +1,14 @@
 using System;
 using System.Linq.Expressions;
-using HotChocolate.Resolvers;
 
 namespace HotChocolate.Types
 {
     public static class DirectiveTypeDescriptorExtensions
     {
         public static IDirectiveTypeDescriptor<T> Ignore<T>(
             this IDirectiveTypeDescriptor<T> descriptor,
-            Expression<Func<T, object>> property)
+            Expression<Func<T, object>> property,
+            bool ignore = true)
         {
             if (descriptor == null)
             {
@@ -20,7 +20,7 @@ public static IDirectiveTypeDescriptor<T> Ignore<T>(
                 throw new ArgumentNullException(nameof(property));
             }
 
-            descriptor.Argument(property).Ignore();
+            descriptor.Argument(property).Ignore(ignore);
             return descriptor;
         }
     }

src/Core/Types/Types/Descriptors/Extensions/InputObjectTypeDescriptorExtensions.cs

@@ -7,7 +7,8 @@ public static class InputObjectTypeDescriptorExtensions
     {
         public static IInputObjectTypeDescriptor<T> Ignore<T>(
             this IInputObjectTypeDescriptor<T> descriptor,
-            Expression<Func<T, object>> property)
+            Expression<Func<T, object>> property,
+            bool ignore = true)
         {
             if (descriptor == null)
             {
@@ -19,7 +20,7 @@ public static IInputObjectTypeDescriptor<T> Ignore<T>(
                 throw new ArgumentNullException(nameof(property));
             }
 
-            descriptor.Field(property).Ignore();
+            descriptor.Field(property).Ignore(ignore);
             return descriptor;
         }
     }

src/Core/Types/Types/Descriptors/Extensions/InterfaceTypeDescriptorExtensions.cs

@@ -7,7 +7,8 @@ public static class InterfaceTypeDescriptorExtensions
     {
         public static IInterfaceTypeDescriptor<T> Ignore<T>(
             this IInterfaceTypeDescriptor<T> descriptor,
-            Expression<Func<T, object>> propertyOrMethod)
+            Expression<Func<T, object>> propertyOrMethod,
+            bool ignore = true)
         {
             if (descriptor == null)
             {
@@ -19,7 +20,7 @@ public static IInterfaceTypeDescriptor<T> Ignore<T>(
                 throw new ArgumentNullException(nameof(propertyOrMethod));
             }
 
-            descriptor.Field(propertyOrMethod).Ignore();
+            descriptor.Field(propertyOrMethod).Ignore(ignore);
             return descriptor;
         }
     }

src/Core/Types/Types/Descriptors/Extensions/ObjectTypeDescriptorExtensions.cs

@@ -7,7 +7,8 @@ public static class ObjectTypeDescriptorExtensions
     {
         public static IObjectTypeDescriptor<T> Ignore<T>(
             this IObjectTypeDescriptor<T> descriptor,
-            Expression<Func<T, object>> propertyOrMethod)
+            Expression<Func<T, object>> propertyOrMethod,
+            bool ignore = true)
         {
             if (descriptor == null)
             {
@@ -19,7 +20,7 @@ public static IObjectTypeDescriptor<T> Ignore<T>(
                 throw new ArgumentNullException(nameof(propertyOrMethod));
             }
 
-            descriptor.Field(propertyOrMethod).Ignore();
+            descriptor.Field(propertyOrMethod).Ignore(ignore);
             return descriptor;
         }
     }

src/Core/Types/Types/Descriptors/InputFieldDescriptor.cs

@@ -95,9 +95,9 @@ public IInputFieldDescriptor Name(NameString value)
             return this;
         }
 
-        public IInputFieldDescriptor Ignore()
+        public IInputFieldDescriptor Ignore(bool ignore = true)
         {
-            Definition.Ignore = true;
+            Definition.Ignore = ignore;
             return this;
         }
 

src/Core/Types/Types/Descriptors/InputObjectTypeDescriptor.cs

@@ -95,7 +95,10 @@ public IInputObjectTypeDescriptor Description(string value)
         public IInputFieldDescriptor Field(NameString name)
         {
             InputFieldDescriptor fieldDescriptor =
-                Fields.FirstOrDefault(t => t.Definition.Name.Equals(name));
+                Fields.FirstOrDefault(t =>
+                    t.Definition.Name.Equals(name)
+                    && !t.Definition.Ignore);
+
             if (fieldDescriptor is { })
             {
                 return fieldDescriptor;

src/Core/Types/Types/Descriptors/InputObjectTypeDescriptor~1.cs

@@ -80,6 +80,7 @@ public IInputFieldDescriptor Field<TValue>(
             {
                 InputFieldDescriptor fieldDescriptor =
                     Fields.FirstOrDefault(t => t.Definition.Property == p);
+
                 if (fieldDescriptor is { })
                 {
                     return fieldDescriptor;

src/Core/Types/Types/Descriptors/InterfaceTypeDescriptor.cs

@@ -94,7 +94,10 @@ public IInterfaceTypeDescriptor Description(string value)
         public IInterfaceFieldDescriptor Field(NameString name)
         {
             InterfaceFieldDescriptor fieldDescriptor =
-                Fields.FirstOrDefault(t => t.Definition.Name.Equals(name));
+                Fields.FirstOrDefault(t =>
+                    t.Definition.Name.Equals(name)
+                    && !t.Definition.Ignore);
+
             if (fieldDescriptor is { })
             {
                 return fieldDescriptor;

src/Core/Types/Types/Descriptors/ObjectTypeDescriptor.cs

@@ -236,7 +236,9 @@ public IObjectTypeDescriptor IsOfType(IsOfType isOfType)
         public IObjectFieldDescriptor Field(NameString name)
         {
             ObjectFieldDescriptor fieldDescriptor =
-                Fields.FirstOrDefault(t => t.Definition.Name.Equals(name));
+                Fields.FirstOrDefault(t =>
+                    t.Definition.Name.Equals(name)
+                    && !t.Definition.Ignore);
             if (fieldDescriptor is { })
             {
                 return fieldDescriptor;