removed reliance on applyRequiredStatus

Author: twof

src/utilities/applyRequiredStatus.ts

@@ -28,7 +28,6 @@ import {
   isObjectType,
 } from '../../type/definition';
 
-import { applyRequiredStatus } from '../../utilities/applyRequiredStatus';
 import { sortValueNode } from '../../utilities/sortValueNode';
 import { typeFromAST } from '../../utilities/typeFromAST';
 
@@ -607,16 +606,34 @@ function findConflict(
   const type2 = def2?.type;
 
   if (type1 && type2) {
-    const modifiedType1 = applyRequiredStatus(type1, node1.nullabilityAssertion);
-    const modifiedType2 = applyRequiredStatus(type2, node2.nullabilityAssertion);
+    // Two fields have different types
+    if (doTypesConflict(type1, type2)) {
+      return [
+        [
+          responseName,
+          `they return conflicting types "${inspect(type1)}" and "${inspect(
+            type2,
+          )}"`,
+        ],
+        [node1],
+        [node2],
+      ];
+    }
 
-    if (doTypesConflict(modifiedType1, modifiedType2)) {
+    // Two fields have different required operators
+    if (node1.nullabilityAssertion !== node2.nullabilityAssertion) {
       return [
         [
           responseName,
-          `they return conflicting types "${inspect(
-            modifiedType1,
-          )}" and "${inspect(modifiedType2)}"`,
+          `they have conflicting nullability designators "${
+            node1.nullabilityAssertion === undefined
+              ? ''
+              : print(node1.nullabilityAssertion)
+          }" and "${
+            node2.nullabilityAssertion === undefined
+              ? ''
+              : print(node2.nullabilityAssertion)
+          }"`,
         ],
         [node1],
         [node2],