Return early, un-nest if statement

apollographql · Jul 23, 2019 · 561470f · 561470f
1 parent c35f15b
commit 561470f
Showing 1 changed file with 49 additions and 45 deletions.
diff --git a/packages/apollo-federation/src/composition/validate/sdl/uniqueFieldDefinitionNames.ts b/packages/apollo-federation/src/composition/validate/sdl/uniqueFieldDefinitionNames.ts
@@ -88,29 +88,31 @@ export function UniqueFieldDefinitionNames(
       knownFieldNames[typeName] = Object.create(null);
     }
 
-    if (node.fields) {
-      const fieldNames = knownFieldNames[typeName];
-
-      for (const fieldDef of node.fields) {
-        const fieldName = fieldDef.name.value;
-
-        if (hasField(existingTypeMap[typeName], fieldName)) {
-          context.reportError(
-            new GraphQLError(
-              existedFieldDefinitionNameMessage(typeName, fieldName),
-              fieldDef.name,
-            ),
-          );
-        } else if (fieldNames[fieldName]) {
-          context.reportError(
-            new GraphQLError(
-              duplicateFieldDefinitionNameMessage(typeName, fieldName),
-              [fieldNames[fieldName], fieldDef.name],
-            ),
-          );
-        } else {
-          fieldNames[fieldName] = fieldDef.name;
-        }
+    if (!node.fields) {
+      return false;
+    }
+
+    const fieldNames = knownFieldNames[typeName];
+
+    for (const fieldDef of node.fields) {
+      const fieldName = fieldDef.name.value;
+
+      if (hasField(existingTypeMap[typeName], fieldName)) {
+        context.reportError(
+          new GraphQLError(
+            existedFieldDefinitionNameMessage(typeName, fieldName),
+            fieldDef.name,
+          ),
+        );
+      } else if (fieldNames[fieldName]) {
+        context.reportError(
+          new GraphQLError(
+            duplicateFieldDefinitionNameMessage(typeName, fieldName),
+            [fieldNames[fieldName], fieldDef.name],
+          ),
+        );
+      } else {
+        fieldNames[fieldName] = fieldDef.name;
       }
     }
 
@@ -143,28 +145,30 @@ export function UniqueFieldDefinitionNames(
       knownFieldNames[typeName] = Object.create(null);
     }
 
-    if (node.fields) {
-      const fieldNames = knownFieldNames[typeName];
-
-      for (const fieldDef of node.fields) {
-        const fieldName = fieldDef.name.value;
-        if (hasField(existingTypeMap[typeName], fieldName)) {
-          context.reportError(
-            new GraphQLError(
-              existedFieldDefinitionNameMessage(typeName, fieldName),
-              fieldDef.name,
-            ),
-          );
-        } else if (fieldNames[fieldName]) {
-          context.reportError(
-            new GraphQLError(
-              duplicateFieldDefinitionNameMessage(typeName, fieldName),
-              [fieldNames[fieldName], fieldDef.name],
-            ),
-          );
-        } else {
-          fieldNames[fieldName] = fieldDef.name;
-        }
+    if (!node.fields) {
+      return false;
+    }
+
+    const fieldNames = knownFieldNames[typeName];
+
+    for (const fieldDef of node.fields) {
+      const fieldName = fieldDef.name.value;
+      if (hasField(existingTypeMap[typeName], fieldName)) {
+        context.reportError(
+          new GraphQLError(
+            existedFieldDefinitionNameMessage(typeName, fieldName),
+            fieldDef.name,
+          ),
+        );
+      } else if (fieldNames[fieldName]) {
+        context.reportError(
+          new GraphQLError(
+            duplicateFieldDefinitionNameMessage(typeName, fieldName),
+            [fieldNames[fieldName], fieldDef.name],
+          ),
+        );
+      } else {
+        fieldNames[fieldName] = fieldDef.name;
       }
     }