From cf286a809eaee7a6efe178fa1b09ff562322c6f7 Mon Sep 17 00:00:00 2001 From: Jay Herron Date: Fri, 15 Mar 2024 23:29:44 -0600 Subject: [PATCH 1/2] refactor: fixes compiler warnings --- Sources/GraphQL/Type/Directives.swift | 2 ++ .../Validation/Rules/Custom/NoDeprecatedCustomRule.swift | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/GraphQL/Type/Directives.swift b/Sources/GraphQL/Type/Directives.swift index 941977aa..04cfb352 100644 --- a/Sources/GraphQL/Type/Directives.swift +++ b/Sources/GraphQL/Type/Directives.swift @@ -1,3 +1,5 @@ +import OrderedCollections + public enum DirectiveLocation: String, Encodable { // Operations case query = "QUERY" diff --git a/Sources/GraphQL/Validation/Rules/Custom/NoDeprecatedCustomRule.swift b/Sources/GraphQL/Validation/Rules/Custom/NoDeprecatedCustomRule.swift index f0e9faa2..230cff7c 100644 --- a/Sources/GraphQL/Validation/Rules/Custom/NoDeprecatedCustomRule.swift +++ b/Sources/GraphQL/Validation/Rules/Custom/NoDeprecatedCustomRule.swift @@ -52,8 +52,6 @@ public func NoDeprecatedCustomRule(context: ValidationContext) -> Visitor { } } if let node = node as? ObjectField { - let inputObjectDef = context.parentInputType as? GraphQLInputObjectType - if let inputObjectDef = context.parentInputType as? GraphQLInputObjectType, let inputFieldDef = inputObjectDef.fields[node.name.value], From 40d176f00c20dd228aeac7ed430795fe248e93b5 Mon Sep 17 00:00:00 2001 From: Jay Herron Date: Fri, 15 Mar 2024 23:33:38 -0600 Subject: [PATCH 2/2] refactor: swiftformat changes --- Sources/GraphQL/Execution/Execute.swift | 2 +- .../FieldExecutionStrategyTests.swift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/GraphQL/Execution/Execute.swift b/Sources/GraphQL/Execution/Execute.swift index 00c28e25..4abeffb6 100644 --- a/Sources/GraphQL/Execution/Execute.swift +++ b/Sources/GraphQL/Execution/Execute.swift @@ -187,7 +187,7 @@ public struct ConcurrentDispatchFieldExecutionStrategy: QueryFieldExecutionStrat .mapValues { _ -> Future? in nil } var err: Error? - fields.forEach { field in + for field in fields { let fieldASTs = field.value let fieldKey = field.key let fieldPath = path.appending(fieldKey) diff --git a/Tests/GraphQLTests/FieldExecutionStrategyTests/FieldExecutionStrategyTests.swift b/Tests/GraphQLTests/FieldExecutionStrategyTests/FieldExecutionStrategyTests.swift index 03d1e5c2..cd021f3b 100644 --- a/Tests/GraphQLTests/FieldExecutionStrategyTests/FieldExecutionStrategyTests.swift +++ b/Tests/GraphQLTests/FieldExecutionStrategyTests/FieldExecutionStrategyTests.swift @@ -259,7 +259,7 @@ class FieldExecutionStrategyTests: XCTestCase { XCTAssertEqual(result.value.data, multiThrowsExpectedData) let resultErrors = result.value.errors XCTAssertEqual(resultErrors.count, multiThrowsExpectedErrors.count) - multiThrowsExpectedErrors.forEach { m in + for m in multiThrowsExpectedErrors { XCTAssertTrue(resultErrors.contains(m), "Expecting result errors to contain \(m)") } // XCTAssertEqualWithAccuracy(1.0, result.seconds, accuracy: 0.5) @@ -308,7 +308,7 @@ class FieldExecutionStrategyTests: XCTestCase { XCTAssertEqual(result.value.data, multiThrowsExpectedData) let resultErrors = result.value.errors XCTAssertEqual(resultErrors.count, multiThrowsExpectedErrors.count) - multiThrowsExpectedErrors.forEach { m in + for m in multiThrowsExpectedErrors { XCTAssertTrue(resultErrors.contains(m), "Expecting result errors to contain \(m)") } // XCTAssertEqualWithAccuracy(0.1, result.seconds, accuracy: 0.25)