Rework AST to be more type safe and allow mutation#95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
lukel97 wants to merge 19 commits into
base:main
Choose a base branch
from
Draft

Rework AST to be more type safe and allow mutation #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
876c29b
Rework AST to be more type safe and allow mutation
lukel97 Dec 21, 2021
75fb18f
Remove kinds as they are no longer needed
lukel97 Dec 22, 2021
f12c6ba
WIP
lukel97 Jan 26, 2022
13a95b0
Lazily reoslve interface's interfaces in BuildClientSchema
lukel97 Feb 22, 2022
6495218
Fix doTypesOverlap when seeing if object overlaps with interface
lukel97 Feb 23, 2022
ac2a4ed
Handle interface implementations of other interfaces
lukel97 Feb 23, 2022
ac9fbbc
Add variables are input types validation rule
lukel97 Feb 24, 2022
f1d3e38
Fix introspection query encoding
lukel97 Mar 23, 2022
8a71abf
Add specifiedByURL to scalar types
lukel97 Apr 20, 2022
0765b9f
Make subtyping reflexive
lukel97 Jun 9, 2022
3933850
Make GraphQLType Equatable
lukel97 Jun 9, 2022
edcfcba
Make GraphQLNamedType conform to Hashable
lukel97 Jun 9, 2022
fb0397c
Add KnownFragmentNamesRule validation rule
lukel97 Jun 10, 2022
215d0fa
Use ordered dictionary for GraphQLEnumValueMap
lukel97 Jul 21, 2022
de70703
Handle InputObjects in BuildClientSchema for introspection queries
lukel97 Jul 29, 2022
1e830cd
Make InputObjectFieldMap an ordered dictionary
lukel97 Jul 29, 2022
3a4e165
Make InputObject fields lazy
lukel97 Jul 29, 2022
d476ab0
Add tests for VariablesAreInputTypesRule
lukel97 Jul 29, 2022
a353056
Use OrderedDictionary throughout schema definitions
lukel97 Aug 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ let package = Package(
.library(name: "GraphQL", targets: ["GraphQL"]),
],
dependencies: [
.package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.10.1")),
.package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.38.0")),
.package(url: "https://github.com/apple/swift-collections", .upToNextMajor(from: "1.0.0")),
],
targets: [
Expand Down
54 changes: 25 additions & 29 deletions Sources/GraphQL/Execution/Execute.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -359,23 +359,21 @@ func buildExecutionContext(

for definition in documentAST.definitions {
switch definition {
case let definition as OperationDefinition:
case .executableDefinition(.operation(let definition)):
guard !(operationName == nil && possibleOperation != nil) else {
throw GraphQLError(
message: "Must provide operation name if query contains multiple operations."
)
}

if operationName == nil || definition.name?.value == operationName {
possibleOperation = definition
}

case let definition as FragmentDefinition:
case .executableDefinition(.fragment(let definition)):
fragments[definition.name.value] = definition

default:
throw GraphQLError(
message: "GraphQL cannot execute a request containing a \(definition.kind).",
message: "GraphQL cannot execute a request containing a \(type(of: definition)).",
nodes: [definition]
)
}
Expand DownExpand Up@@ -502,7 +500,7 @@ func collectFields(

for selection in selectionSet.selections {
switch selection {
case let field as Field:
case .field(let field):
let shouldInclude = try shouldIncludeNode(
exeContext: exeContext,
directives: field.directives
Expand All@@ -519,7 +517,7 @@ func collectFields(
}

fields[name]?.append(field)
case let inlineFragment as InlineFragment:
case .inlineFragment(let inlineFragment):
let shouldInclude = try shouldIncludeNode(
exeContext: exeContext,
directives: inlineFragment.directives
Expand All@@ -542,43 +540,41 @@ func collectFields(
fields: &fields,
visitedFragmentNames: &visitedFragmentNames
)
case let fragmentSpread as FragmentSpread:
case .fragmentSpread(let fragmentSpread):
let fragmentName = fragmentSpread.name.value

let shouldInclude = try shouldIncludeNode(
exeContext: exeContext,
directives: fragmentSpread.directives
)

guard visitedFragmentNames[fragmentName] == nil && shouldInclude else {
continue
}

visitedFragmentNames[fragmentName] = true

guard let fragment = exeContext.fragments[fragmentName] else {
continue
}

let fragmentConditionMatches = try doesFragmentConditionMatch(
exeContext: exeContext,
fragment: fragment,
type: runtimeType
)

guard fragmentConditionMatches else {
continue
}

try collectFields(
exeContext: exeContext,
runtimeType: runtimeType,
selectionSet: fragment.selectionSet,
fields: &fields,
visitedFragmentNames: &visitedFragmentNames
)
default:
break
}
}

Expand DownExpand Up@@ -629,15 +625,15 @@ func doesFragmentConditionMatch(
return true
}

guard let conditionalType = typeFromAST(schema: exeContext.schema, inputTypeAST: typeConditionAST) else {
guard let conditionalType = typeFromAST(schema: exeContext.schema, inputTypeAST: .namedType(typeConditionAST)) else {
return true
}

if let conditionalType = conditionalType as? GraphQLObjectType, conditionalType.name == type.name {
return true
}

if let abstractType = conditionalType as? GraphQLAbstractType {
if let abstractType = conditionalType as? (any GraphQLAbstractType) {
return exeContext.schema.isSubType(
abstractType: abstractType,
maybeSubType: type
Expand DownExpand Up@@ -765,7 +761,7 @@ func resolveOrError(
// in the execution context.
func completeValueCatchingError(
exeContext: ExecutionContext,
returnType: GraphQLType,
returnType: any GraphQLType,
fieldASTs: [Field],
info: GraphQLResolveInfo,
path: IndexPath,
Expand DownExpand Up@@ -817,7 +813,7 @@ func completeValueCatchingError(
// location information.
func completeValueWithLocatedError(
exeContext: ExecutionContext,
returnType: GraphQLType,
returnType: any GraphQLType,
fieldASTs: [Field],
info: GraphQLResolveInfo,
path: IndexPath,
Expand DownExpand Up@@ -867,7 +863,7 @@ func completeValueWithLocatedError(
*/
func completeValue(
exeContext: ExecutionContext,
returnType: GraphQLType,
returnType: any GraphQLType,
fieldASTs: [Field],
info: GraphQLResolveInfo,
path: IndexPath,
Expand DownExpand Up@@ -916,13 +912,13 @@ func completeValue(

// If field type is a leaf type, Scalar or Enum, serialize to a valid value,
// returning .null if serialization is not possible.
if let returnType = returnType as? GraphQLLeafType {
if let returnType = returnType as? any GraphQLLeafType {
return exeContext.eventLoopGroup.next().makeSucceededFuture(try completeLeafValue(returnType: returnType, result: r))
}

// If field type is an abstract type, Interface or Union, determine the
// runtime Object type and complete for that type.
if let returnType = returnType as? GraphQLAbstractType {
if let returnType = returnType as? any GraphQLAbstractType {
return try completeAbstractValue(
exeContext: exeContext,
returnType: returnType,
Expand DownExpand Up@@ -999,7 +995,7 @@ func completeListValue(
* Complete a Scalar or Enum by serializing to a valid value, returning
* .null if serialization is not possible.
*/
func completeLeafValue(returnType: GraphQLLeafType, result: Any?) throws -> Map {
func completeLeafValue(returnType: any GraphQLLeafType, result: Any?) throws -> Map {
guard let result = result else {
return .null
}
Expand All@@ -1023,7 +1019,7 @@ func completeLeafValue(returnType: GraphQLLeafType, result: Any?) throws -> Map
*/
func completeAbstractValue(
exeContext: ExecutionContext,
returnType: GraphQLAbstractType,
returnType: any GraphQLAbstractType,
fieldASTs: [Field],
info: GraphQLResolveInfo,
path: IndexPath,
Expand All@@ -1046,7 +1042,7 @@ func completeAbstractValue(
}

// If resolveType returns a string, we assume it's a GraphQLObjectType name.
var runtimeType: GraphQLType?
var runtimeType: (any GraphQLType)?

switch resolveResult {
case .name(let name):
Expand DownExpand Up@@ -1143,7 +1139,7 @@ func defaultResolveType(
value: Any,
eventLoopGroup: EventLoopGroup,
info: GraphQLResolveInfo,
abstractType: GraphQLAbstractType
abstractType: any GraphQLAbstractType
) throws -> TypeResolveResult? {
let possibleTypes = info.schema.getPossibleTypes(abstractType: abstractType)

Expand Down
10 changes: 5 additions & 5 deletions Sources/GraphQL/Execution/Values.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ func getVariableValue(schema: GraphQLSchema, definitionAST: VariableDefinition,
let type = typeFromAST(schema: schema, inputTypeAST: definitionAST.type)
let variable = definitionAST.variable

guard let inputType = type as? GraphQLInputType else {
guard let inputType = type as? (any GraphQLInputType) else {
throw GraphQLError(
message:
"Variable \"$\(variable.name.value)\" expected value of type " +
Expand DownExpand Up@@ -112,11 +112,11 @@ func getVariableValue(schema: GraphQLSchema, definitionAST: VariableDefinition,
/**
* Given a type and any value, return a runtime value coerced to match the type.
*/
func coerceValue(value: Map, type: GraphQLInputType) throws -> Map {
func coerceValue(value: Map, type: any GraphQLInputType) throws -> Map {
if let nonNull = type as? GraphQLNonNull {
// Note: we're not checking that the result of coerceValue is non-null.
// We only call this function after calling validate.
guard let nonNullType = nonNull.ofType as? GraphQLInputType else {
guard let nonNullType = nonNull.ofType as? (any GraphQLInputType) else {
throw GraphQLError(message: "NonNull must wrap an input type")
}
return try coerceValue(value: value, type: nonNullType)
Expand All@@ -127,7 +127,7 @@ func coerceValue(value: Map, type: GraphQLInputType) throws -> Map {
}

if let list = type as? GraphQLList {
guard let itemType = list.ofType as? GraphQLInputType else {
guard let itemType = list.ofType as? (any GraphQLInputType) else {
throw GraphQLError(message: "Input list must wrap an input type")
}

Expand DownExpand Up@@ -168,7 +168,7 @@ func coerceValue(value: Map, type: GraphQLInputType) throws -> Map {
return .dictionary(object)
}

if let leafType = type as? GraphQLLeafType {
if let leafType = type as? (any GraphQLLeafType) {
return try leafType.parseValue(value: value)
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Rework AST to be more type safe and allow mutation#95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Draft

lukel97
wants to merge
19
commits into

base:main
Choose a base branch

from

 Draft


Rework AST to be more type safe and allow mutation
#95
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
876c29b

Rework AST to be more type safe and allow mutation


lukel97 Dec 21, 2021
75fb18f

Remove kinds as they are no longer needed


lukel97 Dec 22, 2021
f12c6ba

WIP


lukel97 Jan 26, 2022
13a95b0

Lazily reoslve interface's interfaces in BuildClientSchema


lukel97 Feb 22, 2022
6495218

Fix doTypesOverlap when seeing if object overlaps with interface


lukel97 Feb 23, 2022
ac2a4ed

Handle interface implementations of other interfaces


lukel97 Feb 23, 2022
ac9fbbc

Add variables are input types validation rule


lukel97 Feb 24, 2022
f1d3e38

Fix introspection query encoding


lukel97 Mar 23, 2022
8a71abf

Add specifiedByURL to scalar types


lukel97 Apr 20, 2022
0765b9f

Make subtyping reflexive


lukel97 Jun 9, 2022
3933850

Make GraphQLType Equatable


lukel97 Jun 9, 2022
edcfcba

Make GraphQLNamedType conform to Hashable


lukel97 Jun 9, 2022
fb0397c

Add KnownFragmentNamesRule validation rule


lukel97 Jun 10, 2022
215d0fa

Use ordered dictionary for GraphQLEnumValueMap


lukel97 Jul 21, 2022
de70703

Handle InputObjects in BuildClientSchema for introspection queries


lukel97 Jul 29, 2022
1e830cd

Make InputObjectFieldMap an ordered dictionary


lukel97 Jul 29, 2022
3a4e165

Make InputObject fields lazy


lukel97 Jul 29, 2022
d476ab0

Add tests for VariablesAreInputTypesRule


lukel97 Jul 29, 2022
a353056

Use OrderedDictionary throughout schema definitions


lukel97 Aug 1, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Package.resolved

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
Package.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ let package = Package(
 .library(name: "GraphQL", targets: ["GraphQL"]),
 ],
 dependencies: [
 .package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.10.1")),
 .package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.38.0")),
 .package(url: "https://github.com/apple/swift-collections", .upToNextMajor(from: "1.0.0")),
 ],
 targets: [
Expand Down

54 changes: 25 additions & 29 deletions
Sources/GraphQL/Execution/Execute.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -359,23 +359,21 @@ func buildExecutionContext(

 for definition in documentAST.definitions {
 switch definition {
 case let definition as OperationDefinition:
 case .executableDefinition(.operation(let definition)):
 guard !(operationName == nil && possibleOperation != nil) else {
 throw GraphQLError(
 message: "Must provide operation name if query contains multiple operations."
 )
 }

 if operationName == nil || definition.name?.value == operationName {
 possibleOperation = definition
 }

 case let definition as FragmentDefinition:
 case .executableDefinition(.fragment(let definition)):
 fragments[definition.name.value] = definition

 default:
 throw GraphQLError(
 message: "GraphQL cannot execute a request containing a \(definition.kind).",
 message: "GraphQL cannot execute a request containing a \(type(of: definition)).",
 nodes: [definition]
 )
 }
Expand DownExpand Up@@ -502,7 +500,7 @@ func collectFields(

 for selection in selectionSet.selections {
 switch selection {
 case let field as Field:
 case .field(let field):
 let shouldInclude = try shouldIncludeNode(
 exeContext: exeContext,
 directives: field.directives
Expand All@@ -519,7 +517,7 @@ func collectFields(
 }

 fields[name]?.append(field)
 case let inlineFragment as InlineFragment:
 case .inlineFragment(let inlineFragment):
 let shouldInclude = try shouldIncludeNode(
 exeContext: exeContext,
 directives: inlineFragment.directives
Expand All@@ -542,43 +540,41 @@ func collectFields(
 fields: &fields,
 visitedFragmentNames: &visitedFragmentNames
 )
 case let fragmentSpread as FragmentSpread:
 case .fragmentSpread(let fragmentSpread):
 let fragmentName = fragmentSpread.name.value

 let shouldInclude = try shouldIncludeNode(
 exeContext: exeContext,
 directives: fragmentSpread.directives
 )

 guard visitedFragmentNames[fragmentName] == nil && shouldInclude else {
 continue
 }

 visitedFragmentNames[fragmentName] = true

 guard let fragment = exeContext.fragments[fragmentName] else {
 continue
 }

 let fragmentConditionMatches = try doesFragmentConditionMatch(
 exeContext: exeContext,
 fragment: fragment,
 type: runtimeType
 )

 guard fragmentConditionMatches else {
 continue
 }

 try collectFields(
 exeContext: exeContext,
 runtimeType: runtimeType,
 selectionSet: fragment.selectionSet,
 fields: &fields,
 visitedFragmentNames: &visitedFragmentNames
 )
 default:
 break
 }
 }

Expand DownExpand Up@@ -629,15 +625,15 @@ func doesFragmentConditionMatch(
 return true
 }

 guard let conditionalType = typeFromAST(schema: exeContext.schema, inputTypeAST: typeConditionAST) else {
 guard let conditionalType = typeFromAST(schema: exeContext.schema, inputTypeAST: .namedType(typeConditionAST)) else {
 return true
 }

 if let conditionalType = conditionalType as? GraphQLObjectType, conditionalType.name == type.name {
 return true
 }

 if let abstractType = conditionalType as? GraphQLAbstractType {
 if let abstractType = conditionalType as? (any GraphQLAbstractType) {
 return exeContext.schema.isSubType(
 abstractType: abstractType,
 maybeSubType: type
Expand DownExpand Up@@ -765,7 +761,7 @@ func resolveOrError(
// in the execution context.
func completeValueCatchingError(
 exeContext: ExecutionContext,
 returnType: GraphQLType,
 returnType: any GraphQLType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand DownExpand Up@@ -817,7 +813,7 @@ func completeValueCatchingError(
// location information.
func completeValueWithLocatedError(
 exeContext: ExecutionContext,
 returnType: GraphQLType,
 returnType: any GraphQLType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand DownExpand Up@@ -867,7 +863,7 @@ func completeValueWithLocatedError(
 */
func completeValue(
 exeContext: ExecutionContext,
 returnType: GraphQLType,
 returnType: any GraphQLType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand DownExpand Up@@ -916,13 +912,13 @@ func completeValue(

 // If field type is a leaf type, Scalar or Enum, serialize to a valid value,
 // returning .null if serialization is not possible.
 if let returnType = returnType as? GraphQLLeafType {
 if let returnType = returnType as? any GraphQLLeafType {
 return exeContext.eventLoopGroup.next().makeSucceededFuture(try completeLeafValue(returnType: returnType, result: r))
 }

 // If field type is an abstract type, Interface or Union, determine the
 // runtime Object type and complete for that type.
 if let returnType = returnType as? GraphQLAbstractType {
 if let returnType = returnType as? any GraphQLAbstractType {
 return try completeAbstractValue(
 exeContext: exeContext,
 returnType: returnType,
Expand DownExpand Up@@ -999,7 +995,7 @@ func completeListValue(
 * Complete a Scalar or Enum by serializing to a valid value, returning
 * .null if serialization is not possible.
 */
func completeLeafValue(returnType: GraphQLLeafType, result: Any?) throws -> Map {
func completeLeafValue(returnType: any GraphQLLeafType, result: Any?) throws -> Map {
 guard let result = result else {
 return .null
 }
Expand All@@ -1023,7 +1019,7 @@ func completeLeafValue(returnType: GraphQLLeafType, result: Any?) throws -> Map
 */
func completeAbstractValue(
 exeContext: ExecutionContext,
 returnType: GraphQLAbstractType,
 returnType: any GraphQLAbstractType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand All@@ -1046,7 +1042,7 @@ func completeAbstractValue(
 }

 // If resolveType returns a string, we assume it's a GraphQLObjectType name.
 var runtimeType: GraphQLType?
 var runtimeType: (any GraphQLType)?

 switch resolveResult {
 case .name(let name):
Expand DownExpand Up@@ -1143,7 +1139,7 @@ func defaultResolveType(
 value: Any,
 eventLoopGroup: EventLoopGroup,
 info: GraphQLResolveInfo,
 abstractType: GraphQLAbstractType
 abstractType: any GraphQLAbstractType
) throws -> TypeResolveResult? {
 let possibleTypes = info.schema.getPossibleTypes(abstractType: abstractType)

Expand Down

10 changes: 5 additions & 5 deletions
Sources/GraphQL/Execution/Values.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ func getVariableValue(schema: GraphQLSchema, definitionAST: VariableDefinition,
 let type = typeFromAST(schema: schema, inputTypeAST: definitionAST.type)
 let variable = definitionAST.variable

 guard let inputType = type as? GraphQLInputType else {
 guard let inputType = type as? (any GraphQLInputType) else {
 throw GraphQLError(
 message:
 "Variable \"$\(variable.name.value)\" expected value of type " +
Expand DownExpand Up@@ -112,11 +112,11 @@ func getVariableValue(schema: GraphQLSchema, definitionAST: VariableDefinition,
/**
 * Given a type and any value, return a runtime value coerced to match the type.
 */
func coerceValue(value: Map, type: GraphQLInputType) throws -> Map {
func coerceValue(value: Map, type: any GraphQLInputType) throws -> Map {
 if let nonNull = type as? GraphQLNonNull {
 // Note: we're not checking that the result of coerceValue is non-null.
 // We only call this function after calling validate.
 guard let nonNullType = nonNull.ofType as? GraphQLInputType else {
 guard let nonNullType = nonNull.ofType as? (any GraphQLInputType) else {
 throw GraphQLError(message: "NonNull must wrap an input type")
 }
 return try coerceValue(value: value, type: nonNullType)
Expand All@@ -127,7 +127,7 @@ func coerceValue(value: Map, type: GraphQLInputType) throws -> Map {
 }

 if let list = type as? GraphQLList {
 guard let itemType = list.ofType as? GraphQLInputType else {
 guard let itemType = list.ofType as? (any GraphQLInputType) else {
 throw GraphQLError(message: "Input list must wrap an input type")
 }

Expand DownExpand Up@@ -168,7 +168,7 @@ func coerceValue(value: Map, type: GraphQLInputType) throws -> Map {
 return .dictionary(object)
 }

 if let leafType = type as? GraphQLLeafType {
 if let leafType = type as? (any GraphQLLeafType) {
 return try leafType.parseValue(value: value)
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Rework AST to be more type safe and allow mutation#95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Draft

lukel97
wants to merge
19
commits into

base:main
Choose a base branch

from

 Draft


Rework AST to be more type safe and allow mutation
#95
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
876c29b

Rework AST to be more type safe and allow mutation


lukel97 Dec 21, 2021
75fb18f

Remove kinds as they are no longer needed


lukel97 Dec 22, 2021
f12c6ba

WIP


lukel97 Jan 26, 2022
13a95b0

Lazily reoslve interface's interfaces in BuildClientSchema


lukel97 Feb 22, 2022
6495218

Fix doTypesOverlap when seeing if object overlaps with interface


lukel97 Feb 23, 2022
ac2a4ed

Handle interface implementations of other interfaces


lukel97 Feb 23, 2022
ac9fbbc

Add variables are input types validation rule


lukel97 Feb 24, 2022
f1d3e38

Fix introspection query encoding


lukel97 Mar 23, 2022
8a71abf

Add specifiedByURL to scalar types


lukel97 Apr 20, 2022
0765b9f

Make subtyping reflexive


lukel97 Jun 9, 2022
3933850

Make GraphQLType Equatable


lukel97 Jun 9, 2022
edcfcba

Make GraphQLNamedType conform to Hashable


lukel97 Jun 9, 2022
fb0397c

Add KnownFragmentNamesRule validation rule


lukel97 Jun 10, 2022
215d0fa

Use ordered dictionary for GraphQLEnumValueMap


lukel97 Jul 21, 2022
de70703

Handle InputObjects in BuildClientSchema for introspection queries


lukel97 Jul 29, 2022
1e830cd

Make InputObjectFieldMap an ordered dictionary


lukel97 Jul 29, 2022
3a4e165

Make InputObject fields lazy


lukel97 Jul 29, 2022
d476ab0

Add tests for VariablesAreInputTypesRule


lukel97 Jul 29, 2022
a353056

Use OrderedDictionary throughout schema definitions


lukel97 Aug 1, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Package.resolved

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
Package.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ let package = Package(
 .library(name: "GraphQL", targets: ["GraphQL"]),
 ],
 dependencies: [
 .package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.10.1")),
 .package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.38.0")),
 .package(url: "https://github.com/apple/swift-collections", .upToNextMajor(from: "1.0.0")),
 ],
 targets: [
Expand Down

54 changes: 25 additions & 29 deletions
Sources/GraphQL/Execution/Execute.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -359,23 +359,21 @@ func buildExecutionContext(

 for definition in documentAST.definitions {
 switch definition {
 case let definition as OperationDefinition:
 case .executableDefinition(.operation(let definition)):
 guard !(operationName == nil && possibleOperation != nil) else {
 throw GraphQLError(
 message: "Must provide operation name if query contains multiple operations."
 )
 }

 if operationName == nil || definition.name?.value == operationName {
 possibleOperation = definition
 }

 case let definition as FragmentDefinition:
 case .executableDefinition(.fragment(let definition)):
 fragments[definition.name.value] = definition

 default:
 throw GraphQLError(
 message: "GraphQL cannot execute a request containing a \(definition.kind).",
 message: "GraphQL cannot execute a request containing a \(type(of: definition)).",
 nodes: [definition]
 )
 }
Expand DownExpand Up@@ -502,7 +500,7 @@ func collectFields(

 for selection in selectionSet.selections {
 switch selection {
 case let field as Field:
 case .field(let field):
 let shouldInclude = try shouldIncludeNode(
 exeContext: exeContext,
 directives: field.directives
Expand All@@ -519,7 +517,7 @@ func collectFields(
 }

 fields[name]?.append(field)
 case let inlineFragment as InlineFragment:
 case .inlineFragment(let inlineFragment):
 let shouldInclude = try shouldIncludeNode(
 exeContext: exeContext,
 directives: inlineFragment.directives
Expand All@@ -542,43 +540,41 @@ func collectFields(
 fields: &fields,
 visitedFragmentNames: &visitedFragmentNames
 )
 case let fragmentSpread as FragmentSpread:
 case .fragmentSpread(let fragmentSpread):
 let fragmentName = fragmentSpread.name.value

 let shouldInclude = try shouldIncludeNode(
 exeContext: exeContext,
 directives: fragmentSpread.directives
 )

 guard visitedFragmentNames[fragmentName] == nil && shouldInclude else {
 continue
 }

 visitedFragmentNames[fragmentName] = true

 guard let fragment = exeContext.fragments[fragmentName] else {
 continue
 }

 let fragmentConditionMatches = try doesFragmentConditionMatch(
 exeContext: exeContext,
 fragment: fragment,
 type: runtimeType
 )

 guard fragmentConditionMatches else {
 continue
 }

 try collectFields(
 exeContext: exeContext,
 runtimeType: runtimeType,
 selectionSet: fragment.selectionSet,
 fields: &fields,
 visitedFragmentNames: &visitedFragmentNames
 )
 default:
 break
 }
 }

Expand DownExpand Up@@ -629,15 +625,15 @@ func doesFragmentConditionMatch(
 return true
 }

 guard let conditionalType = typeFromAST(schema: exeContext.schema, inputTypeAST: typeConditionAST) else {
 guard let conditionalType = typeFromAST(schema: exeContext.schema, inputTypeAST: .namedType(typeConditionAST)) else {
 return true
 }

 if let conditionalType = conditionalType as? GraphQLObjectType, conditionalType.name == type.name {
 return true
 }

 if let abstractType = conditionalType as? GraphQLAbstractType {
 if let abstractType = conditionalType as? (any GraphQLAbstractType) {
 return exeContext.schema.isSubType(
 abstractType: abstractType,
 maybeSubType: type
Expand DownExpand Up@@ -765,7 +761,7 @@ func resolveOrError(
// in the execution context.
func completeValueCatchingError(
 exeContext: ExecutionContext,
 returnType: GraphQLType,
 returnType: any GraphQLType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand DownExpand Up@@ -817,7 +813,7 @@ func completeValueCatchingError(
// location information.
func completeValueWithLocatedError(
 exeContext: ExecutionContext,
 returnType: GraphQLType,
 returnType: any GraphQLType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand DownExpand Up@@ -867,7 +863,7 @@ func completeValueWithLocatedError(
 */
func completeValue(
 exeContext: ExecutionContext,
 returnType: GraphQLType,
 returnType: any GraphQLType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand DownExpand Up@@ -916,13 +912,13 @@ func completeValue(

 // If field type is a leaf type, Scalar or Enum, serialize to a valid value,
 // returning .null if serialization is not possible.
 if let returnType = returnType as? GraphQLLeafType {
 if let returnType = returnType as? any GraphQLLeafType {
 return exeContext.eventLoopGroup.next().makeSucceededFuture(try completeLeafValue(returnType: returnType, result: r))
 }

 // If field type is an abstract type, Interface or Union, determine the
 // runtime Object type and complete for that type.
 if let returnType = returnType as? GraphQLAbstractType {
 if let returnType = returnType as? any GraphQLAbstractType {
 return try completeAbstractValue(
 exeContext: exeContext,
 returnType: returnType,
Expand DownExpand Up@@ -999,7 +995,7 @@ func completeListValue(
 * Complete a Scalar or Enum by serializing to a valid value, returning
 * .null if serialization is not possible.
 */
func completeLeafValue(returnType: GraphQLLeafType, result: Any?) throws -> Map {
func completeLeafValue(returnType: any GraphQLLeafType, result: Any?) throws -> Map {
 guard let result = result else {
 return .null
 }
Expand All@@ -1023,7 +1019,7 @@ func completeLeafValue(returnType: GraphQLLeafType, result: Any?) throws -> Map
 */
func completeAbstractValue(
 exeContext: ExecutionContext,
 returnType: GraphQLAbstractType,
 returnType: any GraphQLAbstractType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand All@@ -1046,7 +1042,7 @@ func completeAbstractValue(
 }

 // If resolveType returns a string, we assume it's a GraphQLObjectType name.
 var runtimeType: GraphQLType?
 var runtimeType: (any GraphQLType)?

 switch resolveResult {
 case .name(let name):
Expand DownExpand Up@@ -1143,7 +1139,7 @@ func defaultResolveType(
 value: Any,
 eventLoopGroup: EventLoopGroup,
 info: GraphQLResolveInfo,
 abstractType: GraphQLAbstractType
 abstractType: any GraphQLAbstractType
) throws -> TypeResolveResult? {
 let possibleTypes = info.schema.getPossibleTypes(abstractType: abstractType)

Expand Down

10 changes: 5 additions & 5 deletions
Sources/GraphQL/Execution/Values.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ func getVariableValue(schema: GraphQLSchema, definitionAST: VariableDefinition,
 let type = typeFromAST(schema: schema, inputTypeAST: definitionAST.type)
 let variable = definitionAST.variable

 guard let inputType = type as? GraphQLInputType else {
 guard let inputType = type as? (any GraphQLInputType) else {
 throw GraphQLError(
 message:
 "Variable \"$\(variable.name.value)\" expected value of type " +
Expand DownExpand Up@@ -112,11 +112,11 @@ func getVariableValue(schema: GraphQLSchema, definitionAST: VariableDefinition,
/**
 * Given a type and any value, return a runtime value coerced to match the type.
 */
func coerceValue(value: Map, type: GraphQLInputType) throws -> Map {
func coerceValue(value: Map, type: any GraphQLInputType) throws -> Map {
 if let nonNull = type as? GraphQLNonNull {
 // Note: we're not checking that the result of coerceValue is non-null.
 // We only call this function after calling validate.
 guard let nonNullType = nonNull.ofType as? GraphQLInputType else {
 guard let nonNullType = nonNull.ofType as? (any GraphQLInputType) else {
 throw GraphQLError(message: "NonNull must wrap an input type")
 }
 return try coerceValue(value: value, type: nonNullType)
Expand All@@ -127,7 +127,7 @@ func coerceValue(value: Map, type: GraphQLInputType) throws -> Map {
 }

 if let list = type as? GraphQLList {
 guard let itemType = list.ofType as? GraphQLInputType else {
 guard let itemType = list.ofType as? (any GraphQLInputType) else {
 throw GraphQLError(message: "Input list must wrap an input type")
 }

Expand DownExpand Up@@ -168,7 +168,7 @@ func coerceValue(value: Map, type: GraphQLInputType) throws -> Map {
 return .dictionary(object)
 }

 if let leafType = type as? GraphQLLeafType {
 if let leafType = type as? (any GraphQLLeafType) {
 return try leafType.parseValue(value: value)
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Rework AST to be more type safe and allow mutation#95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Draft

lukel97
wants to merge
19
commits into

base:main
Choose a base branch

from

 Draft


Rework AST to be more type safe and allow mutation
#95
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
876c29b

Rework AST to be more type safe and allow mutation


lukel97 Dec 21, 2021
75fb18f

Remove kinds as they are no longer needed


lukel97 Dec 22, 2021
f12c6ba

WIP


lukel97 Jan 26, 2022
13a95b0

Lazily reoslve interface's interfaces in BuildClientSchema


lukel97 Feb 22, 2022
6495218

Fix doTypesOverlap when seeing if object overlaps with interface


lukel97 Feb 23, 2022
ac2a4ed

Handle interface implementations of other interfaces


lukel97 Feb 23, 2022
ac9fbbc

Add variables are input types validation rule


lukel97 Feb 24, 2022
f1d3e38

Fix introspection query encoding


lukel97 Mar 23, 2022
8a71abf

Add specifiedByURL to scalar types


lukel97 Apr 20, 2022
0765b9f

Make subtyping reflexive


lukel97 Jun 9, 2022
3933850

Make GraphQLType Equatable


lukel97 Jun 9, 2022
edcfcba

Make GraphQLNamedType conform to Hashable


lukel97 Jun 9, 2022
fb0397c

Add KnownFragmentNamesRule validation rule


lukel97 Jun 10, 2022
215d0fa

Use ordered dictionary for GraphQLEnumValueMap


lukel97 Jul 21, 2022
de70703

Handle InputObjects in BuildClientSchema for introspection queries


lukel97 Jul 29, 2022
1e830cd

Make InputObjectFieldMap an ordered dictionary


lukel97 Jul 29, 2022
3a4e165

Make InputObject fields lazy


lukel97 Jul 29, 2022
d476ab0

Add tests for VariablesAreInputTypesRule


lukel97 Jul 29, 2022
a353056

Use OrderedDictionary throughout schema definitions


lukel97 Aug 1, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Package.resolved

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
Package.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ let package = Package(
 .library(name: "GraphQL", targets: ["GraphQL"]),
 ],
 dependencies: [
 .package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.10.1")),
 .package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.38.0")),
 .package(url: "https://github.com/apple/swift-collections", .upToNextMajor(from: "1.0.0")),
 ],
 targets: [
Expand Down

54 changes: 25 additions & 29 deletions
Sources/GraphQL/Execution/Execute.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -359,23 +359,21 @@ func buildExecutionContext(

 for definition in documentAST.definitions {
 switch definition {
 case let definition as OperationDefinition:
 case .executableDefinition(.operation(let definition)):
 guard !(operationName == nil && possibleOperation != nil) else {
 throw GraphQLError(
 message: "Must provide operation name if query contains multiple operations."
 )
 }

 if operationName == nil || definition.name?.value == operationName {
 possibleOperation = definition
 }

 case let definition as FragmentDefinition:
 case .executableDefinition(.fragment(let definition)):
 fragments[definition.name.value] = definition

 default:
 throw GraphQLError(
 message: "GraphQL cannot execute a request containing a \(definition.kind).",
 message: "GraphQL cannot execute a request containing a \(type(of: definition)).",
 nodes: [definition]
 )
 }
Expand DownExpand Up@@ -502,7 +500,7 @@ func collectFields(

 for selection in selectionSet.selections {
 switch selection {
 case let field as Field:
 case .field(let field):
 let shouldInclude = try shouldIncludeNode(
 exeContext: exeContext,
 directives: field.directives
Expand All@@ -519,7 +517,7 @@ func collectFields(
 }

 fields[name]?.append(field)
 case let inlineFragment as InlineFragment:
 case .inlineFragment(let inlineFragment):
 let shouldInclude = try shouldIncludeNode(
 exeContext: exeContext,
 directives: inlineFragment.directives
Expand All@@ -542,43 +540,41 @@ func collectFields(
 fields: &fields,
 visitedFragmentNames: &visitedFragmentNames
 )
 case let fragmentSpread as FragmentSpread:
 case .fragmentSpread(let fragmentSpread):
 let fragmentName = fragmentSpread.name.value

 let shouldInclude = try shouldIncludeNode(
 exeContext: exeContext,
 directives: fragmentSpread.directives
 )

 guard visitedFragmentNames[fragmentName] == nil && shouldInclude else {
 continue
 }

 visitedFragmentNames[fragmentName] = true

 guard let fragment = exeContext.fragments[fragmentName] else {
 continue
 }

 let fragmentConditionMatches = try doesFragmentConditionMatch(
 exeContext: exeContext,
 fragment: fragment,
 type: runtimeType
 )

 guard fragmentConditionMatches else {
 continue
 }

 try collectFields(
 exeContext: exeContext,
 runtimeType: runtimeType,
 selectionSet: fragment.selectionSet,
 fields: &fields,
 visitedFragmentNames: &visitedFragmentNames
 )
 default:
 break
 }
 }

Expand DownExpand Up@@ -629,15 +625,15 @@ func doesFragmentConditionMatch(
 return true
 }

 guard let conditionalType = typeFromAST(schema: exeContext.schema, inputTypeAST: typeConditionAST) else {
 guard let conditionalType = typeFromAST(schema: exeContext.schema, inputTypeAST: .namedType(typeConditionAST)) else {
 return true
 }

 if let conditionalType = conditionalType as? GraphQLObjectType, conditionalType.name == type.name {
 return true
 }

 if let abstractType = conditionalType as? GraphQLAbstractType {
 if let abstractType = conditionalType as? (any GraphQLAbstractType) {
 return exeContext.schema.isSubType(
 abstractType: abstractType,
 maybeSubType: type
Expand DownExpand Up@@ -765,7 +761,7 @@ func resolveOrError(
// in the execution context.
func completeValueCatchingError(
 exeContext: ExecutionContext,
 returnType: GraphQLType,
 returnType: any GraphQLType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand DownExpand Up@@ -817,7 +813,7 @@ func completeValueCatchingError(
// location information.
func completeValueWithLocatedError(
 exeContext: ExecutionContext,
 returnType: GraphQLType,
 returnType: any GraphQLType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand DownExpand Up@@ -867,7 +863,7 @@ func completeValueWithLocatedError(
 */
func completeValue(
 exeContext: ExecutionContext,
 returnType: GraphQLType,
 returnType: any GraphQLType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand DownExpand Up@@ -916,13 +912,13 @@ func completeValue(

 // If field type is a leaf type, Scalar or Enum, serialize to a valid value,
 // returning .null if serialization is not possible.
 if let returnType = returnType as? GraphQLLeafType {
 if let returnType = returnType as? any GraphQLLeafType {
 return exeContext.eventLoopGroup.next().makeSucceededFuture(try completeLeafValue(returnType: returnType, result: r))
 }

 // If field type is an abstract type, Interface or Union, determine the
 // runtime Object type and complete for that type.
 if let returnType = returnType as? GraphQLAbstractType {
 if let returnType = returnType as? any GraphQLAbstractType {
 return try completeAbstractValue(
 exeContext: exeContext,
 returnType: returnType,
Expand DownExpand Up@@ -999,7 +995,7 @@ func completeListValue(
 * Complete a Scalar or Enum by serializing to a valid value, returning
 * .null if serialization is not possible.
 */
func completeLeafValue(returnType: GraphQLLeafType, result: Any?) throws -> Map {
func completeLeafValue(returnType: any GraphQLLeafType, result: Any?) throws -> Map {
 guard let result = result else {
 return .null
 }
Expand All@@ -1023,7 +1019,7 @@ func completeLeafValue(returnType: GraphQLLeafType, result: Any?) throws -> Map
 */
func completeAbstractValue(
 exeContext: ExecutionContext,
 returnType: GraphQLAbstractType,
 returnType: any GraphQLAbstractType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand All@@ -1046,7 +1042,7 @@ func completeAbstractValue(
 }

 // If resolveType returns a string, we assume it's a GraphQLObjectType name.
 var runtimeType: GraphQLType?
 var runtimeType: (any GraphQLType)?

 switch resolveResult {
 case .name(let name):
Expand DownExpand Up@@ -1143,7 +1139,7 @@ func defaultResolveType(
 value: Any,
 eventLoopGroup: EventLoopGroup,
 info: GraphQLResolveInfo,
 abstractType: GraphQLAbstractType
 abstractType: any GraphQLAbstractType
) throws -> TypeResolveResult? {
 let possibleTypes = info.schema.getPossibleTypes(abstractType: abstractType)

Expand Down

10 changes: 5 additions & 5 deletions
Sources/GraphQL/Execution/Values.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ func getVariableValue(schema: GraphQLSchema, definitionAST: VariableDefinition,
 let type = typeFromAST(schema: schema, inputTypeAST: definitionAST.type)
 let variable = definitionAST.variable

 guard let inputType = type as? GraphQLInputType else {
 guard let inputType = type as? (any GraphQLInputType) else {
 throw GraphQLError(
 message:
 "Variable \"$\(variable.name.value)\" expected value of type " +
Expand DownExpand Up@@ -112,11 +112,11 @@ func getVariableValue(schema: GraphQLSchema, definitionAST: VariableDefinition,
/**
 * Given a type and any value, return a runtime value coerced to match the type.
 */
func coerceValue(value: Map, type: GraphQLInputType) throws -> Map {
func coerceValue(value: Map, type: any GraphQLInputType) throws -> Map {
 if let nonNull = type as? GraphQLNonNull {
 // Note: we're not checking that the result of coerceValue is non-null.
 // We only call this function after calling validate.
 guard let nonNullType = nonNull.ofType as? GraphQLInputType else {
 guard let nonNullType = nonNull.ofType as? (any GraphQLInputType) else {
 throw GraphQLError(message: "NonNull must wrap an input type")
 }
 return try coerceValue(value: value, type: nonNullType)
Expand All@@ -127,7 +127,7 @@ func coerceValue(value: Map, type: GraphQLInputType) throws -> Map {
 }

 if let list = type as? GraphQLList {
 guard let itemType = list.ofType as? GraphQLInputType else {
 guard let itemType = list.ofType as? (any GraphQLInputType) else {
 throw GraphQLError(message: "Input list must wrap an input type")
 }

Expand DownExpand Up@@ -168,7 +168,7 @@ func coerceValue(value: Map, type: GraphQLInputType) throws -> Map {
 return .dictionary(object)
 }

 if let leafType = type as? GraphQLLeafType {
 if let leafType = type as? (any GraphQLLeafType) {
 return try leafType.parseValue(value: value)
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Rework AST to be more type safe and allow mutation#95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Draft

lukel97
wants to merge
19
commits into

base:main
Choose a base branch

from

 Draft


Rework AST to be more type safe and allow mutation
#95
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
876c29b

Rework AST to be more type safe and allow mutation


lukel97 Dec 21, 2021
75fb18f

Remove kinds as they are no longer needed


lukel97 Dec 22, 2021
f12c6ba

WIP


lukel97 Jan 26, 2022
13a95b0

Lazily reoslve interface's interfaces in BuildClientSchema


lukel97 Feb 22, 2022
6495218

Fix doTypesOverlap when seeing if object overlaps with interface


lukel97 Feb 23, 2022
ac2a4ed

Handle interface implementations of other interfaces


lukel97 Feb 23, 2022
ac9fbbc

Add variables are input types validation rule


lukel97 Feb 24, 2022
f1d3e38

Fix introspection query encoding


lukel97 Mar 23, 2022
8a71abf

Add specifiedByURL to scalar types


lukel97 Apr 20, 2022
0765b9f

Make subtyping reflexive


lukel97 Jun 9, 2022
3933850

Make GraphQLType Equatable


lukel97 Jun 9, 2022
edcfcba

Make GraphQLNamedType conform to Hashable


lukel97 Jun 9, 2022
fb0397c

Add KnownFragmentNamesRule validation rule


lukel97 Jun 10, 2022
215d0fa

Use ordered dictionary for GraphQLEnumValueMap


lukel97 Jul 21, 2022
de70703

Handle InputObjects in BuildClientSchema for introspection queries


lukel97 Jul 29, 2022
1e830cd

Make InputObjectFieldMap an ordered dictionary


lukel97 Jul 29, 2022
3a4e165

Make InputObject fields lazy


lukel97 Jul 29, 2022
d476ab0

Add tests for VariablesAreInputTypesRule


lukel97 Jul 29, 2022
a353056

Use OrderedDictionary throughout schema definitions


lukel97 Aug 1, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Package.resolved

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
Package.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ let package = Package(
 .library(name: "GraphQL", targets: ["GraphQL"]),
 ],
 dependencies: [
 .package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.10.1")),
 .package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.38.0")),
 .package(url: "https://github.com/apple/swift-collections", .upToNextMajor(from: "1.0.0")),
 ],
 targets: [
Expand Down

54 changes: 25 additions & 29 deletions
Sources/GraphQL/Execution/Execute.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -359,23 +359,21 @@ func buildExecutionContext(

 for definition in documentAST.definitions {
 switch definition {
 case let definition as OperationDefinition:
 case .executableDefinition(.operation(let definition)):
 guard !(operationName == nil && possibleOperation != nil) else {
 throw GraphQLError(
 message: "Must provide operation name if query contains multiple operations."
 )
 }

 if operationName == nil || definition.name?.value == operationName {
 possibleOperation = definition
 }

 case let definition as FragmentDefinition:
 case .executableDefinition(.fragment(let definition)):
 fragments[definition.name.value] = definition

 default:
 throw GraphQLError(
 message: "GraphQL cannot execute a request containing a \(definition.kind).",
 message: "GraphQL cannot execute a request containing a \(type(of: definition)).",
 nodes: [definition]
 )
 }
Expand DownExpand Up@@ -502,7 +500,7 @@ func collectFields(

 for selection in selectionSet.selections {
 switch selection {
 case let field as Field:
 case .field(let field):
 let shouldInclude = try shouldIncludeNode(
 exeContext: exeContext,
 directives: field.directives
Expand All@@ -519,7 +517,7 @@ func collectFields(
 }

 fields[name]?.append(field)
 case let inlineFragment as InlineFragment:
 case .inlineFragment(let inlineFragment):
 let shouldInclude = try shouldIncludeNode(
 exeContext: exeContext,
 directives: inlineFragment.directives
Expand All@@ -542,43 +540,41 @@ func collectFields(
 fields: &fields,
 visitedFragmentNames: &visitedFragmentNames
 )
 case let fragmentSpread as FragmentSpread:
 case .fragmentSpread(let fragmentSpread):
 let fragmentName = fragmentSpread.name.value

 let shouldInclude = try shouldIncludeNode(
 exeContext: exeContext,
 directives: fragmentSpread.directives
 )

 guard visitedFragmentNames[fragmentName] == nil && shouldInclude else {
 continue
 }

 visitedFragmentNames[fragmentName] = true

 guard let fragment = exeContext.fragments[fragmentName] else {
 continue
 }

 let fragmentConditionMatches = try doesFragmentConditionMatch(
 exeContext: exeContext,
 fragment: fragment,
 type: runtimeType
 )

 guard fragmentConditionMatches else {
 continue
 }

 try collectFields(
 exeContext: exeContext,
 runtimeType: runtimeType,
 selectionSet: fragment.selectionSet,
 fields: &fields,
 visitedFragmentNames: &visitedFragmentNames
 )
 default:
 break
 }
 }

Expand DownExpand Up@@ -629,15 +625,15 @@ func doesFragmentConditionMatch(
 return true
 }

 guard let conditionalType = typeFromAST(schema: exeContext.schema, inputTypeAST: typeConditionAST) else {
 guard let conditionalType = typeFromAST(schema: exeContext.schema, inputTypeAST: .namedType(typeConditionAST)) else {
 return true
 }

 if let conditionalType = conditionalType as? GraphQLObjectType, conditionalType.name == type.name {
 return true
 }

 if let abstractType = conditionalType as? GraphQLAbstractType {
 if let abstractType = conditionalType as? (any GraphQLAbstractType) {
 return exeContext.schema.isSubType(
 abstractType: abstractType,
 maybeSubType: type
Expand DownExpand Up@@ -765,7 +761,7 @@ func resolveOrError(
// in the execution context.
func completeValueCatchingError(
 exeContext: ExecutionContext,
 returnType: GraphQLType,
 returnType: any GraphQLType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand DownExpand Up@@ -817,7 +813,7 @@ func completeValueCatchingError(
// location information.
func completeValueWithLocatedError(
 exeContext: ExecutionContext,
 returnType: GraphQLType,
 returnType: any GraphQLType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand DownExpand Up@@ -867,7 +863,7 @@ func completeValueWithLocatedError(
 */
func completeValue(
 exeContext: ExecutionContext,
 returnType: GraphQLType,
 returnType: any GraphQLType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand DownExpand Up@@ -916,13 +912,13 @@ func completeValue(

 // If field type is a leaf type, Scalar or Enum, serialize to a valid value,
 // returning .null if serialization is not possible.
 if let returnType = returnType as? GraphQLLeafType {
 if let returnType = returnType as? any GraphQLLeafType {
 return exeContext.eventLoopGroup.next().makeSucceededFuture(try completeLeafValue(returnType: returnType, result: r))
 }

 // If field type is an abstract type, Interface or Union, determine the
 // runtime Object type and complete for that type.
 if let returnType = returnType as? GraphQLAbstractType {
 if let returnType = returnType as? any GraphQLAbstractType {
 return try completeAbstractValue(
 exeContext: exeContext,
 returnType: returnType,
Expand DownExpand Up@@ -999,7 +995,7 @@ func completeListValue(
 * Complete a Scalar or Enum by serializing to a valid value, returning
 * .null if serialization is not possible.
 */
func completeLeafValue(returnType: GraphQLLeafType, result: Any?) throws -> Map {
func completeLeafValue(returnType: any GraphQLLeafType, result: Any?) throws -> Map {
 guard let result = result else {
 return .null
 }
Expand All@@ -1023,7 +1019,7 @@ func completeLeafValue(returnType: GraphQLLeafType, result: Any?) throws -> Map
 */
func completeAbstractValue(
 exeContext: ExecutionContext,
 returnType: GraphQLAbstractType,
 returnType: any GraphQLAbstractType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand All@@ -1046,7 +1042,7 @@ func completeAbstractValue(
 }

 // If resolveType returns a string, we assume it's a GraphQLObjectType name.
 var runtimeType: GraphQLType?
 var runtimeType: (any GraphQLType)?

 switch resolveResult {
 case .name(let name):
Expand DownExpand Up@@ -1143,7 +1139,7 @@ func defaultResolveType(
 value: Any,
 eventLoopGroup: EventLoopGroup,
 info: GraphQLResolveInfo,
 abstractType: GraphQLAbstractType
 abstractType: any GraphQLAbstractType
) throws -> TypeResolveResult? {
 let possibleTypes = info.schema.getPossibleTypes(abstractType: abstractType)

Expand Down

10 changes: 5 additions & 5 deletions
Sources/GraphQL/Execution/Values.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ func getVariableValue(schema: GraphQLSchema, definitionAST: VariableDefinition,
 let type = typeFromAST(schema: schema, inputTypeAST: definitionAST.type)
 let variable = definitionAST.variable

 guard let inputType = type as? GraphQLInputType else {
 guard let inputType = type as? (any GraphQLInputType) else {
 throw GraphQLError(
 message:
 "Variable \"$\(variable.name.value)\" expected value of type " +
Expand DownExpand Up@@ -112,11 +112,11 @@ func getVariableValue(schema: GraphQLSchema, definitionAST: VariableDefinition,
/**
 * Given a type and any value, return a runtime value coerced to match the type.
 */
func coerceValue(value: Map, type: GraphQLInputType) throws -> Map {
func coerceValue(value: Map, type: any GraphQLInputType) throws -> Map {
 if let nonNull = type as? GraphQLNonNull {
 // Note: we're not checking that the result of coerceValue is non-null.
 // We only call this function after calling validate.
 guard let nonNullType = nonNull.ofType as? GraphQLInputType else {
 guard let nonNullType = nonNull.ofType as? (any GraphQLInputType) else {
 throw GraphQLError(message: "NonNull must wrap an input type")
 }
 return try coerceValue(value: value, type: nonNullType)
Expand All@@ -127,7 +127,7 @@ func coerceValue(value: Map, type: GraphQLInputType) throws -> Map {
 }

 if let list = type as? GraphQLList {
 guard let itemType = list.ofType as? GraphQLInputType else {
 guard let itemType = list.ofType as? (any GraphQLInputType) else {
 throw GraphQLError(message: "Input list must wrap an input type")
 }

Expand DownExpand Up@@ -168,7 +168,7 @@ func coerceValue(value: Map, type: GraphQLInputType) throws -> Map {
 return .dictionary(object)
 }

 if let leafType = type as? GraphQLLeafType {
 if let leafType = type as? (any GraphQLLeafType) {
 return try leafType.parseValue(value: value)
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Rework AST to be more type safe and allow mutation#95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Draft

lukel97
wants to merge
19
commits into

base:main
Choose a base branch

from

 Draft


Rework AST to be more type safe and allow mutation
#95
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
876c29b

Rework AST to be more type safe and allow mutation


lukel97 Dec 21, 2021
75fb18f

Remove kinds as they are no longer needed


lukel97 Dec 22, 2021
f12c6ba

WIP


lukel97 Jan 26, 2022
13a95b0

Lazily reoslve interface's interfaces in BuildClientSchema


lukel97 Feb 22, 2022
6495218

Fix doTypesOverlap when seeing if object overlaps with interface


lukel97 Feb 23, 2022
ac2a4ed

Handle interface implementations of other interfaces


lukel97 Feb 23, 2022
ac9fbbc

Add variables are input types validation rule


lukel97 Feb 24, 2022
f1d3e38

Fix introspection query encoding


lukel97 Mar 23, 2022
8a71abf

Add specifiedByURL to scalar types


lukel97 Apr 20, 2022
0765b9f

Make subtyping reflexive


lukel97 Jun 9, 2022
3933850

Make GraphQLType Equatable


lukel97 Jun 9, 2022
edcfcba

Make GraphQLNamedType conform to Hashable


lukel97 Jun 9, 2022
fb0397c

Add KnownFragmentNamesRule validation rule


lukel97 Jun 10, 2022
215d0fa

Use ordered dictionary for GraphQLEnumValueMap


lukel97 Jul 21, 2022
de70703

Handle InputObjects in BuildClientSchema for introspection queries


lukel97 Jul 29, 2022
1e830cd

Make InputObjectFieldMap an ordered dictionary


lukel97 Jul 29, 2022
3a4e165

Make InputObject fields lazy


lukel97 Jul 29, 2022
d476ab0

Add tests for VariablesAreInputTypesRule


lukel97 Jul 29, 2022
a353056

Use OrderedDictionary throughout schema definitions


lukel97 Aug 1, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Package.resolved

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
Package.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ let package = Package(
 .library(name: "GraphQL", targets: ["GraphQL"]),
 ],
 dependencies: [
 .package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.10.1")),
 .package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.38.0")),
 .package(url: "https://github.com/apple/swift-collections", .upToNextMajor(from: "1.0.0")),
 ],
 targets: [
Expand Down

54 changes: 25 additions & 29 deletions
Sources/GraphQL/Execution/Execute.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -359,23 +359,21 @@ func buildExecutionContext(

 for definition in documentAST.definitions {
 switch definition {
 case let definition as OperationDefinition:
 case .executableDefinition(.operation(let definition)):
 guard !(operationName == nil && possibleOperation != nil) else {
 throw GraphQLError(
 message: "Must provide operation name if query contains multiple operations."
 )
 }

 if operationName == nil || definition.name?.value == operationName {
 possibleOperation = definition
 }

 case let definition as FragmentDefinition:
 case .executableDefinition(.fragment(let definition)):
 fragments[definition.name.value] = definition

 default:
 throw GraphQLError(
 message: "GraphQL cannot execute a request containing a \(definition.kind).",
 message: "GraphQL cannot execute a request containing a \(type(of: definition)).",
 nodes: [definition]
 )
 }
Expand DownExpand Up@@ -502,7 +500,7 @@ func collectFields(

 for selection in selectionSet.selections {
 switch selection {
 case let field as Field:
 case .field(let field):
 let shouldInclude = try shouldIncludeNode(
 exeContext: exeContext,
 directives: field.directives
Expand All@@ -519,7 +517,7 @@ func collectFields(
 }

 fields[name]?.append(field)
 case let inlineFragment as InlineFragment:
 case .inlineFragment(let inlineFragment):
 let shouldInclude = try shouldIncludeNode(
 exeContext: exeContext,
 directives: inlineFragment.directives
Expand All@@ -542,43 +540,41 @@ func collectFields(
 fields: &fields,
 visitedFragmentNames: &visitedFragmentNames
 )
 case let fragmentSpread as FragmentSpread:
 case .fragmentSpread(let fragmentSpread):
 let fragmentName = fragmentSpread.name.value

 let shouldInclude = try shouldIncludeNode(
 exeContext: exeContext,
 directives: fragmentSpread.directives
 )

 guard visitedFragmentNames[fragmentName] == nil && shouldInclude else {
 continue
 }

 visitedFragmentNames[fragmentName] = true

 guard let fragment = exeContext.fragments[fragmentName] else {
 continue
 }

 let fragmentConditionMatches = try doesFragmentConditionMatch(
 exeContext: exeContext,
 fragment: fragment,
 type: runtimeType
 )

 guard fragmentConditionMatches else {
 continue
 }

 try collectFields(
 exeContext: exeContext,
 runtimeType: runtimeType,
 selectionSet: fragment.selectionSet,
 fields: &fields,
 visitedFragmentNames: &visitedFragmentNames
 )
 default:
 break
 }
 }

Expand DownExpand Up@@ -629,15 +625,15 @@ func doesFragmentConditionMatch(
 return true
 }

 guard let conditionalType = typeFromAST(schema: exeContext.schema, inputTypeAST: typeConditionAST) else {
 guard let conditionalType = typeFromAST(schema: exeContext.schema, inputTypeAST: .namedType(typeConditionAST)) else {
 return true
 }

 if let conditionalType = conditionalType as? GraphQLObjectType, conditionalType.name == type.name {
 return true
 }

 if let abstractType = conditionalType as? GraphQLAbstractType {
 if let abstractType = conditionalType as? (any GraphQLAbstractType) {
 return exeContext.schema.isSubType(
 abstractType: abstractType,
 maybeSubType: type
Expand DownExpand Up@@ -765,7 +761,7 @@ func resolveOrError(
// in the execution context.
func completeValueCatchingError(
 exeContext: ExecutionContext,
 returnType: GraphQLType,
 returnType: any GraphQLType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand DownExpand Up@@ -817,7 +813,7 @@ func completeValueCatchingError(
// location information.
func completeValueWithLocatedError(
 exeContext: ExecutionContext,
 returnType: GraphQLType,
 returnType: any GraphQLType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand DownExpand Up@@ -867,7 +863,7 @@ func completeValueWithLocatedError(
 */
func completeValue(
 exeContext: ExecutionContext,
 returnType: GraphQLType,
 returnType: any GraphQLType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand DownExpand Up@@ -916,13 +912,13 @@ func completeValue(

 // If field type is a leaf type, Scalar or Enum, serialize to a valid value,
 // returning .null if serialization is not possible.
 if let returnType = returnType as? GraphQLLeafType {
 if let returnType = returnType as? any GraphQLLeafType {
 return exeContext.eventLoopGroup.next().makeSucceededFuture(try completeLeafValue(returnType: returnType, result: r))
 }

 // If field type is an abstract type, Interface or Union, determine the
 // runtime Object type and complete for that type.
 if let returnType = returnType as? GraphQLAbstractType {
 if let returnType = returnType as? any GraphQLAbstractType {
 return try completeAbstractValue(
 exeContext: exeContext,
 returnType: returnType,
Expand DownExpand Up@@ -999,7 +995,7 @@ func completeListValue(
 * Complete a Scalar or Enum by serializing to a valid value, returning
 * .null if serialization is not possible.
 */
func completeLeafValue(returnType: GraphQLLeafType, result: Any?) throws -> Map {
func completeLeafValue(returnType: any GraphQLLeafType, result: Any?) throws -> Map {
 guard let result = result else {
 return .null
 }
Expand All@@ -1023,7 +1019,7 @@ func completeLeafValue(returnType: GraphQLLeafType, result: Any?) throws -> Map
 */
func completeAbstractValue(
 exeContext: ExecutionContext,
 returnType: GraphQLAbstractType,
 returnType: any GraphQLAbstractType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand All@@ -1046,7 +1042,7 @@ func completeAbstractValue(
 }

 // If resolveType returns a string, we assume it's a GraphQLObjectType name.
 var runtimeType: GraphQLType?
 var runtimeType: (any GraphQLType)?

 switch resolveResult {
 case .name(let name):
Expand DownExpand Up@@ -1143,7 +1139,7 @@ func defaultResolveType(
 value: Any,
 eventLoopGroup: EventLoopGroup,
 info: GraphQLResolveInfo,
 abstractType: GraphQLAbstractType
 abstractType: any GraphQLAbstractType
) throws -> TypeResolveResult? {
 let possibleTypes = info.schema.getPossibleTypes(abstractType: abstractType)

Expand Down

10 changes: 5 additions & 5 deletions
Sources/GraphQL/Execution/Values.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ func getVariableValue(schema: GraphQLSchema, definitionAST: VariableDefinition,
 let type = typeFromAST(schema: schema, inputTypeAST: definitionAST.type)
 let variable = definitionAST.variable

 guard let inputType = type as? GraphQLInputType else {
 guard let inputType = type as? (any GraphQLInputType) else {
 throw GraphQLError(
 message:
 "Variable \"$\(variable.name.value)\" expected value of type " +
Expand DownExpand Up@@ -112,11 +112,11 @@ func getVariableValue(schema: GraphQLSchema, definitionAST: VariableDefinition,
/**
 * Given a type and any value, return a runtime value coerced to match the type.
 */
func coerceValue(value: Map, type: GraphQLInputType) throws -> Map {
func coerceValue(value: Map, type: any GraphQLInputType) throws -> Map {
 if let nonNull = type as? GraphQLNonNull {
 // Note: we're not checking that the result of coerceValue is non-null.
 // We only call this function after calling validate.
 guard let nonNullType = nonNull.ofType as? GraphQLInputType else {
 guard let nonNullType = nonNull.ofType as? (any GraphQLInputType) else {
 throw GraphQLError(message: "NonNull must wrap an input type")
 }
 return try coerceValue(value: value, type: nonNullType)
Expand All@@ -127,7 +127,7 @@ func coerceValue(value: Map, type: GraphQLInputType) throws -> Map {
 }

 if let list = type as? GraphQLList {
 guard let itemType = list.ofType as? GraphQLInputType else {
 guard let itemType = list.ofType as? (any GraphQLInputType) else {
 throw GraphQLError(message: "Input list must wrap an input type")
 }

Expand DownExpand Up@@ -168,7 +168,7 @@ func coerceValue(value: Map, type: GraphQLInputType) throws -> Map {
 return .dictionary(object)
 }

 if let leafType = type as? GraphQLLeafType {
 if let leafType = type as? (any GraphQLLeafType) {
 return try leafType.parseValue(value: value)
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Rework AST to be more type safe and allow mutation#95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Draft

lukel97
wants to merge
19
commits into

base:main
Choose a base branch

from

 Draft


Rework AST to be more type safe and allow mutation
#95
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
876c29b

Rework AST to be more type safe and allow mutation


lukel97 Dec 21, 2021
75fb18f

Remove kinds as they are no longer needed


lukel97 Dec 22, 2021
f12c6ba

WIP


lukel97 Jan 26, 2022
13a95b0

Lazily reoslve interface's interfaces in BuildClientSchema


lukel97 Feb 22, 2022
6495218

Fix doTypesOverlap when seeing if object overlaps with interface


lukel97 Feb 23, 2022
ac2a4ed

Handle interface implementations of other interfaces


lukel97 Feb 23, 2022
ac9fbbc

Add variables are input types validation rule


lukel97 Feb 24, 2022
f1d3e38

Fix introspection query encoding


lukel97 Mar 23, 2022
8a71abf

Add specifiedByURL to scalar types


lukel97 Apr 20, 2022
0765b9f

Make subtyping reflexive


lukel97 Jun 9, 2022
3933850

Make GraphQLType Equatable


lukel97 Jun 9, 2022
edcfcba

Make GraphQLNamedType conform to Hashable


lukel97 Jun 9, 2022
fb0397c

Add KnownFragmentNamesRule validation rule


lukel97 Jun 10, 2022
215d0fa

Use ordered dictionary for GraphQLEnumValueMap


lukel97 Jul 21, 2022
de70703

Handle InputObjects in BuildClientSchema for introspection queries


lukel97 Jul 29, 2022
1e830cd

Make InputObjectFieldMap an ordered dictionary


lukel97 Jul 29, 2022
3a4e165

Make InputObject fields lazy


lukel97 Jul 29, 2022
d476ab0

Add tests for VariablesAreInputTypesRule


lukel97 Jul 29, 2022
a353056

Use OrderedDictionary throughout schema definitions


lukel97 Aug 1, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Package.resolved

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
Package.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ let package = Package(
 .library(name: "GraphQL", targets: ["GraphQL"]),
 ],
 dependencies: [
 .package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.10.1")),
 .package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.38.0")),
 .package(url: "https://github.com/apple/swift-collections", .upToNextMajor(from: "1.0.0")),
 ],
 targets: [
Expand Down

54 changes: 25 additions & 29 deletions
Sources/GraphQL/Execution/Execute.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -359,23 +359,21 @@ func buildExecutionContext(

 for definition in documentAST.definitions {
 switch definition {
 case let definition as OperationDefinition:
 case .executableDefinition(.operation(let definition)):
 guard !(operationName == nil && possibleOperation != nil) else {
 throw GraphQLError(
 message: "Must provide operation name if query contains multiple operations."
 )
 }

 if operationName == nil || definition.name?.value == operationName {
 possibleOperation = definition
 }

 case let definition as FragmentDefinition:
 case .executableDefinition(.fragment(let definition)):
 fragments[definition.name.value] = definition

 default:
 throw GraphQLError(
 message: "GraphQL cannot execute a request containing a \(definition.kind).",
 message: "GraphQL cannot execute a request containing a \(type(of: definition)).",
 nodes: [definition]
 )
 }
Expand DownExpand Up@@ -502,7 +500,7 @@ func collectFields(

 for selection in selectionSet.selections {
 switch selection {
 case let field as Field:
 case .field(let field):
 let shouldInclude = try shouldIncludeNode(
 exeContext: exeContext,
 directives: field.directives
Expand All@@ -519,7 +517,7 @@ func collectFields(
 }

 fields[name]?.append(field)
 case let inlineFragment as InlineFragment:
 case .inlineFragment(let inlineFragment):
 let shouldInclude = try shouldIncludeNode(
 exeContext: exeContext,
 directives: inlineFragment.directives
Expand All@@ -542,43 +540,41 @@ func collectFields(
 fields: &fields,
 visitedFragmentNames: &visitedFragmentNames
 )
 case let fragmentSpread as FragmentSpread:
 case .fragmentSpread(let fragmentSpread):
 let fragmentName = fragmentSpread.name.value

 let shouldInclude = try shouldIncludeNode(
 exeContext: exeContext,
 directives: fragmentSpread.directives
 )

 guard visitedFragmentNames[fragmentName] == nil && shouldInclude else {
 continue
 }

 visitedFragmentNames[fragmentName] = true

 guard let fragment = exeContext.fragments[fragmentName] else {
 continue
 }

 let fragmentConditionMatches = try doesFragmentConditionMatch(
 exeContext: exeContext,
 fragment: fragment,
 type: runtimeType
 )

 guard fragmentConditionMatches else {
 continue
 }

 try collectFields(
 exeContext: exeContext,
 runtimeType: runtimeType,
 selectionSet: fragment.selectionSet,
 fields: &fields,
 visitedFragmentNames: &visitedFragmentNames
 )
 default:
 break
 }
 }

Expand DownExpand Up@@ -629,15 +625,15 @@ func doesFragmentConditionMatch(
 return true
 }

 guard let conditionalType = typeFromAST(schema: exeContext.schema, inputTypeAST: typeConditionAST) else {
 guard let conditionalType = typeFromAST(schema: exeContext.schema, inputTypeAST: .namedType(typeConditionAST)) else {
 return true
 }

 if let conditionalType = conditionalType as? GraphQLObjectType, conditionalType.name == type.name {
 return true
 }

 if let abstractType = conditionalType as? GraphQLAbstractType {
 if let abstractType = conditionalType as? (any GraphQLAbstractType) {
 return exeContext.schema.isSubType(
 abstractType: abstractType,
 maybeSubType: type
Expand DownExpand Up@@ -765,7 +761,7 @@ func resolveOrError(
// in the execution context.
func completeValueCatchingError(
 exeContext: ExecutionContext,
 returnType: GraphQLType,
 returnType: any GraphQLType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand DownExpand Up@@ -817,7 +813,7 @@ func completeValueCatchingError(
// location information.
func completeValueWithLocatedError(
 exeContext: ExecutionContext,
 returnType: GraphQLType,
 returnType: any GraphQLType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand DownExpand Up@@ -867,7 +863,7 @@ func completeValueWithLocatedError(
 */
func completeValue(
 exeContext: ExecutionContext,
 returnType: GraphQLType,
 returnType: any GraphQLType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand DownExpand Up@@ -916,13 +912,13 @@ func completeValue(

 // If field type is a leaf type, Scalar or Enum, serialize to a valid value,
 // returning .null if serialization is not possible.
 if let returnType = returnType as? GraphQLLeafType {
 if let returnType = returnType as? any GraphQLLeafType {
 return exeContext.eventLoopGroup.next().makeSucceededFuture(try completeLeafValue(returnType: returnType, result: r))
 }

 // If field type is an abstract type, Interface or Union, determine the
 // runtime Object type and complete for that type.
 if let returnType = returnType as? GraphQLAbstractType {
 if let returnType = returnType as? any GraphQLAbstractType {
 return try completeAbstractValue(
 exeContext: exeContext,
 returnType: returnType,
Expand DownExpand Up@@ -999,7 +995,7 @@ func completeListValue(
 * Complete a Scalar or Enum by serializing to a valid value, returning
 * .null if serialization is not possible.
 */
func completeLeafValue(returnType: GraphQLLeafType, result: Any?) throws -> Map {
func completeLeafValue(returnType: any GraphQLLeafType, result: Any?) throws -> Map {
 guard let result = result else {
 return .null
 }
Expand All@@ -1023,7 +1019,7 @@ func completeLeafValue(returnType: GraphQLLeafType, result: Any?) throws -> Map
 */
func completeAbstractValue(
 exeContext: ExecutionContext,
 returnType: GraphQLAbstractType,
 returnType: any GraphQLAbstractType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand All@@ -1046,7 +1042,7 @@ func completeAbstractValue(
 }

 // If resolveType returns a string, we assume it's a GraphQLObjectType name.
 var runtimeType: GraphQLType?
 var runtimeType: (any GraphQLType)?

 switch resolveResult {
 case .name(let name):
Expand DownExpand Up@@ -1143,7 +1139,7 @@ func defaultResolveType(
 value: Any,
 eventLoopGroup: EventLoopGroup,
 info: GraphQLResolveInfo,
 abstractType: GraphQLAbstractType
 abstractType: any GraphQLAbstractType
) throws -> TypeResolveResult? {
 let possibleTypes = info.schema.getPossibleTypes(abstractType: abstractType)

Expand Down

10 changes: 5 additions & 5 deletions
Sources/GraphQL/Execution/Values.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ func getVariableValue(schema: GraphQLSchema, definitionAST: VariableDefinition,
 let type = typeFromAST(schema: schema, inputTypeAST: definitionAST.type)
 let variable = definitionAST.variable

 guard let inputType = type as? GraphQLInputType else {
 guard let inputType = type as? (any GraphQLInputType) else {
 throw GraphQLError(
 message:
 "Variable \"$\(variable.name.value)\" expected value of type " +
Expand DownExpand Up@@ -112,11 +112,11 @@ func getVariableValue(schema: GraphQLSchema, definitionAST: VariableDefinition,
/**
 * Given a type and any value, return a runtime value coerced to match the type.
 */
func coerceValue(value: Map, type: GraphQLInputType) throws -> Map {
func coerceValue(value: Map, type: any GraphQLInputType) throws -> Map {
 if let nonNull = type as? GraphQLNonNull {
 // Note: we're not checking that the result of coerceValue is non-null.
 // We only call this function after calling validate.
 guard let nonNullType = nonNull.ofType as? GraphQLInputType else {
 guard let nonNullType = nonNull.ofType as? (any GraphQLInputType) else {
 throw GraphQLError(message: "NonNull must wrap an input type")
 }
 return try coerceValue(value: value, type: nonNullType)
Expand All@@ -127,7 +127,7 @@ func coerceValue(value: Map, type: GraphQLInputType) throws -> Map {
 }

 if let list = type as? GraphQLList {
 guard let itemType = list.ofType as? GraphQLInputType else {
 guard let itemType = list.ofType as? (any GraphQLInputType) else {
 throw GraphQLError(message: "Input list must wrap an input type")
 }

Expand DownExpand Up@@ -168,7 +168,7 @@ func coerceValue(value: Map, type: GraphQLInputType) throws -> Map {
 return .dictionary(object)
 }

 if let leafType = type as? GraphQLLeafType {
 if let leafType = type as? (any GraphQLLeafType) {
 return try leafType.parseValue(value: value)
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Rework AST to be more type safe and allow mutation#95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Draft

lukel97
wants to merge
19
commits into

base:main
Choose a base branch

from

 Draft


Rework AST to be more type safe and allow mutation
#95
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


19 commits


Select commit
Hold shift + click to select a range
876c29b

Rework AST to be more type safe and allow mutation


lukel97 Dec 21, 2021
75fb18f

Remove kinds as they are no longer needed


lukel97 Dec 22, 2021
f12c6ba

WIP


lukel97 Jan 26, 2022
13a95b0

Lazily reoslve interface's interfaces in BuildClientSchema


lukel97 Feb 22, 2022
6495218

Fix doTypesOverlap when seeing if object overlaps with interface


lukel97 Feb 23, 2022
ac2a4ed

Handle interface implementations of other interfaces


lukel97 Feb 23, 2022
ac9fbbc

Add variables are input types validation rule


lukel97 Feb 24, 2022
f1d3e38

Fix introspection query encoding


lukel97 Mar 23, 2022
8a71abf

Add specifiedByURL to scalar types


lukel97 Apr 20, 2022
0765b9f

Make subtyping reflexive


lukel97 Jun 9, 2022
3933850

Make GraphQLType Equatable


lukel97 Jun 9, 2022
edcfcba

Make GraphQLNamedType conform to Hashable


lukel97 Jun 9, 2022
fb0397c

Add KnownFragmentNamesRule validation rule


lukel97 Jun 10, 2022
215d0fa

Use ordered dictionary for GraphQLEnumValueMap


lukel97 Jul 21, 2022
de70703

Handle InputObjects in BuildClientSchema for introspection queries


lukel97 Jul 29, 2022
1e830cd

Make InputObjectFieldMap an ordered dictionary


lukel97 Jul 29, 2022
3a4e165

Make InputObject fields lazy


lukel97 Jul 29, 2022
d476ab0

Add tests for VariablesAreInputTypesRule


lukel97 Jul 29, 2022
a353056

Use OrderedDictionary throughout schema definitions


lukel97 Aug 1, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Package.resolved

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


2 changes: 1 addition & 1 deletion
Package.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ let package = Package(
 .library(name: "GraphQL", targets: ["GraphQL"]),
 ],
 dependencies: [
 .package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.10.1")),
 .package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.38.0")),
 .package(url: "https://github.com/apple/swift-collections", .upToNextMajor(from: "1.0.0")),
 ],
 targets: [
Expand Down

54 changes: 25 additions & 29 deletions
Sources/GraphQL/Execution/Execute.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -359,23 +359,21 @@ func buildExecutionContext(

 for definition in documentAST.definitions {
 switch definition {
 case let definition as OperationDefinition:
 case .executableDefinition(.operation(let definition)):
 guard !(operationName == nil && possibleOperation != nil) else {
 throw GraphQLError(
 message: "Must provide operation name if query contains multiple operations."
 )
 }

 if operationName == nil || definition.name?.value == operationName {
 possibleOperation = definition
 }

 case let definition as FragmentDefinition:
 case .executableDefinition(.fragment(let definition)):
 fragments[definition.name.value] = definition

 default:
 throw GraphQLError(
 message: "GraphQL cannot execute a request containing a \(definition.kind).",
 message: "GraphQL cannot execute a request containing a \(type(of: definition)).",
 nodes: [definition]
 )
 }
Expand DownExpand Up@@ -502,7 +500,7 @@ func collectFields(

 for selection in selectionSet.selections {
 switch selection {
 case let field as Field:
 case .field(let field):
 let shouldInclude = try shouldIncludeNode(
 exeContext: exeContext,
 directives: field.directives
Expand All@@ -519,7 +517,7 @@ func collectFields(
 }

 fields[name]?.append(field)
 case let inlineFragment as InlineFragment:
 case .inlineFragment(let inlineFragment):
 let shouldInclude = try shouldIncludeNode(
 exeContext: exeContext,
 directives: inlineFragment.directives
Expand All@@ -542,43 +540,41 @@ func collectFields(
 fields: &fields,
 visitedFragmentNames: &visitedFragmentNames
 )
 case let fragmentSpread as FragmentSpread:
 case .fragmentSpread(let fragmentSpread):
 let fragmentName = fragmentSpread.name.value

 let shouldInclude = try shouldIncludeNode(
 exeContext: exeContext,
 directives: fragmentSpread.directives
 )

 guard visitedFragmentNames[fragmentName] == nil && shouldInclude else {
 continue
 }

 visitedFragmentNames[fragmentName] = true

 guard let fragment = exeContext.fragments[fragmentName] else {
 continue
 }

 let fragmentConditionMatches = try doesFragmentConditionMatch(
 exeContext: exeContext,
 fragment: fragment,
 type: runtimeType
 )

 guard fragmentConditionMatches else {
 continue
 }

 try collectFields(
 exeContext: exeContext,
 runtimeType: runtimeType,
 selectionSet: fragment.selectionSet,
 fields: &fields,
 visitedFragmentNames: &visitedFragmentNames
 )
 default:
 break
 }
 }

Expand DownExpand Up@@ -629,15 +625,15 @@ func doesFragmentConditionMatch(
 return true
 }

 guard let conditionalType = typeFromAST(schema: exeContext.schema, inputTypeAST: typeConditionAST) else {
 guard let conditionalType = typeFromAST(schema: exeContext.schema, inputTypeAST: .namedType(typeConditionAST)) else {
 return true
 }

 if let conditionalType = conditionalType as? GraphQLObjectType, conditionalType.name == type.name {
 return true
 }

 if let abstractType = conditionalType as? GraphQLAbstractType {
 if let abstractType = conditionalType as? (any GraphQLAbstractType) {
 return exeContext.schema.isSubType(
 abstractType: abstractType,
 maybeSubType: type
Expand DownExpand Up@@ -765,7 +761,7 @@ func resolveOrError(
// in the execution context.
func completeValueCatchingError(
 exeContext: ExecutionContext,
 returnType: GraphQLType,
 returnType: any GraphQLType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand DownExpand Up@@ -817,7 +813,7 @@ func completeValueCatchingError(
// location information.
func completeValueWithLocatedError(
 exeContext: ExecutionContext,
 returnType: GraphQLType,
 returnType: any GraphQLType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand DownExpand Up@@ -867,7 +863,7 @@ func completeValueWithLocatedError(
 */
func completeValue(
 exeContext: ExecutionContext,
 returnType: GraphQLType,
 returnType: any GraphQLType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand DownExpand Up@@ -916,13 +912,13 @@ func completeValue(

 // If field type is a leaf type, Scalar or Enum, serialize to a valid value,
 // returning .null if serialization is not possible.
 if let returnType = returnType as? GraphQLLeafType {
 if let returnType = returnType as? any GraphQLLeafType {
 return exeContext.eventLoopGroup.next().makeSucceededFuture(try completeLeafValue(returnType: returnType, result: r))
 }

 // If field type is an abstract type, Interface or Union, determine the
 // runtime Object type and complete for that type.
 if let returnType = returnType as? GraphQLAbstractType {
 if let returnType = returnType as? any GraphQLAbstractType {
 return try completeAbstractValue(
 exeContext: exeContext,
 returnType: returnType,
Expand DownExpand Up@@ -999,7 +995,7 @@ func completeListValue(
 * Complete a Scalar or Enum by serializing to a valid value, returning
 * .null if serialization is not possible.
 */
func completeLeafValue(returnType: GraphQLLeafType, result: Any?) throws -> Map {
func completeLeafValue(returnType: any GraphQLLeafType, result: Any?) throws -> Map {
 guard let result = result else {
 return .null
 }
Expand All@@ -1023,7 +1019,7 @@ func completeLeafValue(returnType: GraphQLLeafType, result: Any?) throws -> Map
 */
func completeAbstractValue(
 exeContext: ExecutionContext,
 returnType: GraphQLAbstractType,
 returnType: any GraphQLAbstractType,
 fieldASTs: [Field],
 info: GraphQLResolveInfo,
 path: IndexPath,
Expand All@@ -1046,7 +1042,7 @@ func completeAbstractValue(
 }

 // If resolveType returns a string, we assume it's a GraphQLObjectType name.
 var runtimeType: GraphQLType?
 var runtimeType: (any GraphQLType)?

 switch resolveResult {
 case .name(let name):
Expand DownExpand Up@@ -1143,7 +1139,7 @@ func defaultResolveType(
 value: Any,
 eventLoopGroup: EventLoopGroup,
 info: GraphQLResolveInfo,
 abstractType: GraphQLAbstractType
 abstractType: any GraphQLAbstractType
) throws -> TypeResolveResult? {
 let possibleTypes = info.schema.getPossibleTypes(abstractType: abstractType)

Expand Down

10 changes: 5 additions & 5 deletions
Sources/GraphQL/Execution/Values.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -82,7 +82,7 @@ func getVariableValue(schema: GraphQLSchema, definitionAST: VariableDefinition,
 let type = typeFromAST(schema: schema, inputTypeAST: definitionAST.type)
 let variable = definitionAST.variable

 guard let inputType = type as? GraphQLInputType else {
 guard let inputType = type as? (any GraphQLInputType) else {
 throw GraphQLError(
 message:
 "Variable \"$\(variable.name.value)\" expected value of type " +
Expand DownExpand Up@@ -112,11 +112,11 @@ func getVariableValue(schema: GraphQLSchema, definitionAST: VariableDefinition,
/**
 * Given a type and any value, return a runtime value coerced to match the type.
 */
func coerceValue(value: Map, type: GraphQLInputType) throws -> Map {
func coerceValue(value: Map, type: any GraphQLInputType) throws -> Map {
 if let nonNull = type as? GraphQLNonNull {
 // Note: we're not checking that the result of coerceValue is non-null.
 // We only call this function after calling validate.
 guard let nonNullType = nonNull.ofType as? GraphQLInputType else {
 guard let nonNullType = nonNull.ofType as? (any GraphQLInputType) else {
 throw GraphQLError(message: "NonNull must wrap an input type")
 }
 return try coerceValue(value: value, type: nonNullType)
Expand All@@ -127,7 +127,7 @@ func coerceValue(value: Map, type: GraphQLInputType) throws -> Map {
 }

 if let list = type as? GraphQLList {
 guard let itemType = list.ofType as? GraphQLInputType else {
 guard let itemType = list.ofType as? (any GraphQLInputType) else {
 throw GraphQLError(message: "Input list must wrap an input type")
 }

Expand DownExpand Up@@ -168,7 +168,7 @@ func coerceValue(value: Map, type: GraphQLInputType) throws -> Map {
 return .dictionary(object)
 }

 if let leafType = type as? GraphQLLeafType {
 if let leafType = type as? (any GraphQLLeafType) {
 return try leafType.parseValue(value: value)
 }

Expand Down
Loading