Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .swift-format
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
{
"version": 1,
"indentation" : {
"spaces" : 4
},
"lineBreakBeforeEachArgument": true
}
14 changes: 7 additions & 7 deletions Benchmarks/Benchmarks/GraphQLBenchmarks.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,19 +6,19 @@ let benchmarks: @Sendable () -> Void = {
let result = try await graphql(
schema: starWarsSchema,
request: """
query NestedQuery {
hero {
name
friends {
query NestedQuery {
hero {
name
appearsIn
friends {
name
appearsIn
friends {
name
}
}
}
}
}
"""
"""
)
}
}
20 changes: 5 additions & 15 deletions Benchmarks/Benchmarks/StarWarsData.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,16 +126,12 @@ let droidData: [String: Droid] = [
"2001": r2d2,
]

/**
* Helper function to get a character by ID.
*/
/// Helper function to get a character by ID.
@Sendable func getCharacter(id: String) -> Character? {
return humanData[id] ?? droidData[id]
}

/**
* Allows us to query for a character"s friends.
*/
/// Allows us to query for a character"s friends.
@Sendable func getFriends(character: Character) -> [Character] {
return character.friends.reduce(into: []) { friends, friendID in
if let friend = getCharacter(id: friendID) {
Expand All@@ -144,9 +140,7 @@ let droidData: [String: Droid] = [
}
}

/**
* Allows us to fetch the undisputed hero of the Star Wars trilogy, R2-D2.
*/
/// Allows us to fetch the undisputed hero of the Star Wars trilogy, R2-D2.
@Sendable func getHero(episode: Episode?) -> Character {
if episode == .empire {
// Luke is the hero of Episode V.
Expand All@@ -156,16 +150,12 @@ let droidData: [String: Droid] = [
return r2d2
}

/**
* Allows us to query for the human with the given id.
*/
/// Allows us to query for the human with the given id.
@Sendable func getHuman(id: String) -> Human? {
return humanData[id]
}

/**
* Allows us to query for the droid with the given id.
*/
/// Allows us to query for the droid with the given id.
@Sendable func getDroid(id: String) -> Droid? {
return droidData[id]
}
168 changes: 78 additions & 90 deletions Benchmarks/Benchmarks/StarWarsSchema.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,12 +49,10 @@ import GraphQL
* We begin by setting up our schema.
*/

/**
* The original trilogy consists of three movies.
*
* This implements the following type system shorthand:
* enum Episode { NEWHOPE, EMPIRE, JEDI }
*/
/// The original trilogy consists of three movies.
///
/// This implements the following type system shorthand:
/// enum Episode { NEWHOPE, EMPIRE, JEDI }
let EpisodeEnum = try! GraphQLEnumType(
name: "Episode",
description: "One of the films in the Star Wars Trilogy",
Expand All@@ -74,43 +72,43 @@ let EpisodeEnum = try! GraphQLEnumType(
]
)

/**
* Characters in the Star Wars trilogy are either humans or droids.
*
* This implements the following type system shorthand:
* interface Character {
* id: String!
* name: String
* friends: [Character]
* appearsIn: [Episode]
* secretBackstory: String
* }
*/
/// Characters in the Star Wars trilogy are either humans or droids.
///
/// This implements the following type system shorthand:
/// interface Character {
/// id: String!
/// name: String
/// friends: [Character]
/// appearsIn: [Episode]
/// secretBackstory: String
/// }
let CharacterInterface = try! GraphQLInterfaceType(
name: "Character",
description: "A character in the Star Wars Trilogy",
fields: { [
"id": GraphQLField(
type: GraphQLNonNull(GraphQLString),
description: "The id of the character."
),
"name": GraphQLField(
type: GraphQLString,
description: "The name of the character."
),
"friends": GraphQLField(
type: GraphQLList(CharacterInterface),
description: "The friends of the character, or an empty list if they have none."
),
"appearsIn": GraphQLField(
type: GraphQLList(EpisodeEnum),
description: "Which movies they appear in."
),
"secretBackstory": GraphQLField(
type: GraphQLString,
description: "All secrets about their past."
),
] },
fields: {
[
"id": GraphQLField(
type: GraphQLNonNull(GraphQLString),
description: "The id of the character."
),
"name": GraphQLField(
type: GraphQLString,
description: "The name of the character."
),
"friends": GraphQLField(
type: GraphQLList(CharacterInterface),
description: "The friends of the character, or an empty list if they have none."
),
"appearsIn": GraphQLField(
type: GraphQLList(EpisodeEnum),
description: "Which movies they appear in."
),
"secretBackstory": GraphQLField(
type: GraphQLString,
description: "All secrets about their past."
),
]
},
resolveType: { character, _ in
switch character {
case is Human:
Expand All@@ -121,18 +119,16 @@ let CharacterInterface = try! GraphQLInterfaceType(
}
)

/**
* We define our human type, which implements the character interface.
*
* This implements the following type system shorthand:
* type Human : Character {
* id: String!
* name: String
* friends: [Character]
* appearsIn: [Episode]
* secretBackstory: String
* }
*/
/// We define our human type, which implements the character interface.
///
/// This implements the following type system shorthand:
/// type Human : Character {
/// id: String!
/// name: String
/// friends: [Character]
/// appearsIn: [Episode]
/// secretBackstory: String
/// }
let HumanType = try! GraphQLObjectType(
name: "Human",
description: "A humanoid creature in the Star Wars universe.",
Expand All@@ -147,8 +143,7 @@ let HumanType = try! GraphQLObjectType(
),
"friends": GraphQLField(
type: GraphQLList(CharacterInterface),
description: "The friends of the human, or an empty list if they " +
"have none.",
description: "The friends of the human, or an empty list if they " + "have none.",
resolve: { human, _, _, _ in
getFriends(character: human as! Human)
}
Expand DownExpand Up@@ -179,19 +174,17 @@ let HumanType = try! GraphQLObjectType(
}
)

/**
* The other type of character in Star Wars is a droid.
*
* This implements the following type system shorthand:
* type Droid : Character {
* id: String!
* name: String
* friends: [Character]
* appearsIn: [Episode]
* secretBackstory: String
* primaryFunction: String
* }
*/
/// The other type of character in Star Wars is a droid.
///
/// This implements the following type system shorthand:
/// type Droid : Character {
/// id: String!
/// name: String
/// friends: [Character]
/// appearsIn: [Episode]
/// secretBackstory: String
/// primaryFunction: String
/// }
let DroidType = try! GraphQLObjectType(
name: "Droid",
description: "A mechanical creature in the Star Wars universe.",
Expand DownExpand Up@@ -237,20 +230,17 @@ let DroidType = try! GraphQLObjectType(
}
)

/**
* This is the type that will be the root of our query, and the
* entry point into our schema. It gives us the ability to fetch
* objects by their IDs, as well as to fetch the undisputed hero
* of the Star Wars trilogy, R2-D2, directly.
*
* This implements the following type system shorthand:
* type Query {
* hero(episode: Episode): Character
* human(id: String!): Human
* droid(id: String!): Droid
* }
*
*/
/// This is the type that will be the root of our query, and the
/// entry point into our schema. It gives us the ability to fetch
/// objects by their IDs, as well as to fetch the undisputed hero
/// of the Star Wars trilogy, R2-D2, directly.
///
/// This implements the following type system shorthand:
/// type Query {
/// hero(episode: Episode): Character
/// human(id: String!): Human
/// droid(id: String!): Droid
/// }
let QueryType = try! GraphQLObjectType(
name: "Query",
fields: [
Expand All@@ -260,9 +250,9 @@ let QueryType = try! GraphQLObjectType(
"episode": GraphQLArgument(
type: EpisodeEnum,
description:
"If omitted, returns the hero of the whole saga. If " +
"provided, returns the hero of that particular episode."
),
"If omitted, returns the hero of the whole saga. If "
+ "provided, returns the hero of that particular episode."
)
],
resolve: { _, arguments, _, _ in
let episode = Episode(arguments["episode"].string)
Expand All@@ -275,7 +265,7 @@ let QueryType = try! GraphQLObjectType(
"id": GraphQLArgument(
type: GraphQLNonNull(GraphQLString),
description: "id of the human"
),
)
],
resolve: { _, arguments, _, _ in
getHuman(id: arguments["id"].string!)
Expand All@@ -287,7 +277,7 @@ let QueryType = try! GraphQLObjectType(
"id": GraphQLArgument(
type: GraphQLNonNull(GraphQLString),
description: "id of the droid"
),
)
],
resolve: { _, arguments, _, _ in
getDroid(id: arguments["id"].string!)
Expand All@@ -296,10 +286,8 @@ let QueryType = try! GraphQLObjectType(
]
)

/**
* Finally, we construct our schema (whose starting query type is the query
* type we defined above) and export it.
*/
/// Finally, we construct our schema (whose starting query type is the query
/// type we defined above) and export it.
let starWarsSchema = try! GraphQLSchema(
query: QueryType,
types: [HumanType, DroidType]
Expand Down
4 changes: 2 additions & 2 deletions Benchmarks/Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,9 @@ let package = Package(
],
path: "Benchmarks",
plugins: [
.plugin(name: "BenchmarkPlugin", package: "package-benchmark"),
.plugin(name: "BenchmarkPlugin", package: "package-benchmark")
]
),
)
],
swiftLanguageVersions: [.v5, .version("6")]
)
6 changes: 3 additions & 3 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,16 +5,16 @@ let package = Package(
name: "GraphQL",
platforms: [.macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6)],
products: [
.library(name: "GraphQL", targets: ["GraphQL"]),
.library(name: "GraphQL", targets: ["GraphQL"])
],
dependencies: [
.package(url: "https://github.com/apple/swift-collections", .upToNextMajor(from: "1.0.0")),
.package(url: "https://github.com/apple/swift-collections", .upToNextMajor(from: "1.0.0"))
],
targets: [
.target(
name: "GraphQL",
dependencies: [
.product(name: "OrderedCollections", package: "swift-collections"),
.product(name: "OrderedCollections", package: "swift-collections")
]
),
.testTarget(
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -124,11 +124,11 @@ Those contributing to this package are expected to follow the [Swift Code of Con
[Swift API Design Guidelines](https://swift.org/documentation/api-design-guidelines/), and the
[SSWG Technical Best Practices](https://github.com/swift-server/sswg/blob/main/process/incubation.md#technical-best-practices).

This repo uses [SwiftFormat](https://github.com/nicklockwood/SwiftFormat), and includes lint checks to enforce these formatting standards.
To format your code, install `swiftformat` and run:
This repo uses the standard [swift format](https://github.com/swiftlang/swift-format), and includes lint checks to enforce these formatting standards.
To format your code, run:

```bash
swiftformat .
swift format --parallel --in-place --recursive ./
```

Most of this repo mirrors the structure of
Expand Down
Loading
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .swift-format
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
{
"version": 1,
"indentation" : {
"spaces" : 4
},
"lineBreakBeforeEachArgument": true
}
14 changes: 7 additions & 7 deletions Benchmarks/Benchmarks/GraphQLBenchmarks.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,19 +6,19 @@ let benchmarks: @Sendable () -> Void = {
let result = try await graphql(
schema: starWarsSchema,
request: """
query NestedQuery {
hero {
name
friends {
query NestedQuery {
hero {
name
appearsIn
friends {
name
appearsIn
friends {
name
}
}
}
}
}
"""
"""
)
}
}
20 changes: 5 additions & 15 deletions Benchmarks/Benchmarks/StarWarsData.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,16 +126,12 @@ let droidData: [String: Droid] = [
"2001": r2d2,
]

/**
* Helper function to get a character by ID.
*/
/// Helper function to get a character by ID.
@Sendable func getCharacter(id: String) -> Character? {
return humanData[id] ?? droidData[id]
}

/**
* Allows us to query for a character"s friends.
*/
/// Allows us to query for a character"s friends.
@Sendable func getFriends(character: Character) -> [Character] {
return character.friends.reduce(into: []) { friends, friendID in
if let friend = getCharacter(id: friendID) {
Expand All@@ -144,9 +140,7 @@ let droidData: [String: Droid] = [
}
}

/**
* Allows us to fetch the undisputed hero of the Star Wars trilogy, R2-D2.
*/
/// Allows us to fetch the undisputed hero of the Star Wars trilogy, R2-D2.
@Sendable func getHero(episode: Episode?) -> Character {
if episode == .empire {
// Luke is the hero of Episode V.
Expand All@@ -156,16 +150,12 @@ let droidData: [String: Droid] = [
return r2d2
}

/**
* Allows us to query for the human with the given id.
*/
/// Allows us to query for the human with the given id.
@Sendable func getHuman(id: String) -> Human? {
return humanData[id]
}

/**
* Allows us to query for the droid with the given id.
*/
/// Allows us to query for the droid with the given id.
@Sendable func getDroid(id: String) -> Droid? {
return droidData[id]
}
168 changes: 78 additions & 90 deletions Benchmarks/Benchmarks/StarWarsSchema.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,12 +49,10 @@ import GraphQL
* We begin by setting up our schema.
*/

/**
* The original trilogy consists of three movies.
*
* This implements the following type system shorthand:
* enum Episode { NEWHOPE, EMPIRE, JEDI }
*/
/// The original trilogy consists of three movies.
///
/// This implements the following type system shorthand:
/// enum Episode { NEWHOPE, EMPIRE, JEDI }
let EpisodeEnum = try! GraphQLEnumType(
name: "Episode",
description: "One of the films in the Star Wars Trilogy",
Expand All@@ -74,43 +72,43 @@ let EpisodeEnum = try! GraphQLEnumType(
]
)

/**
* Characters in the Star Wars trilogy are either humans or droids.
*
* This implements the following type system shorthand:
* interface Character {
* id: String!
* name: String
* friends: [Character]
* appearsIn: [Episode]
* secretBackstory: String
* }
*/
/// Characters in the Star Wars trilogy are either humans or droids.
///
/// This implements the following type system shorthand:
/// interface Character {
/// id: String!
/// name: String
/// friends: [Character]
/// appearsIn: [Episode]
/// secretBackstory: String
/// }
let CharacterInterface = try! GraphQLInterfaceType(
name: "Character",
description: "A character in the Star Wars Trilogy",
fields: { [
"id": GraphQLField(
type: GraphQLNonNull(GraphQLString),
description: "The id of the character."
),
"name": GraphQLField(
type: GraphQLString,
description: "The name of the character."
),
"friends": GraphQLField(
type: GraphQLList(CharacterInterface),
description: "The friends of the character, or an empty list if they have none."
),
"appearsIn": GraphQLField(
type: GraphQLList(EpisodeEnum),
description: "Which movies they appear in."
),
"secretBackstory": GraphQLField(
type: GraphQLString,
description: "All secrets about their past."
),
] },
fields: {
[
"id": GraphQLField(
type: GraphQLNonNull(GraphQLString),
description: "The id of the character."
),
"name": GraphQLField(
type: GraphQLString,
description: "The name of the character."
),
"friends": GraphQLField(
type: GraphQLList(CharacterInterface),
description: "The friends of the character, or an empty list if they have none."
),
"appearsIn": GraphQLField(
type: GraphQLList(EpisodeEnum),
description: "Which movies they appear in."
),
"secretBackstory": GraphQLField(
type: GraphQLString,
description: "All secrets about their past."
),
]
},
resolveType: { character, _ in
switch character {
case is Human:
Expand All@@ -121,18 +119,16 @@ let CharacterInterface = try! GraphQLInterfaceType(
}
)

/**
* We define our human type, which implements the character interface.
*
* This implements the following type system shorthand:
* type Human : Character {
* id: String!
* name: String
* friends: [Character]
* appearsIn: [Episode]
* secretBackstory: String
* }
*/
/// We define our human type, which implements the character interface.
///
/// This implements the following type system shorthand:
/// type Human : Character {
/// id: String!
/// name: String
/// friends: [Character]
/// appearsIn: [Episode]
/// secretBackstory: String
/// }
let HumanType = try! GraphQLObjectType(
name: "Human",
description: "A humanoid creature in the Star Wars universe.",
Expand All@@ -147,8 +143,7 @@ let HumanType = try! GraphQLObjectType(
),
"friends": GraphQLField(
type: GraphQLList(CharacterInterface),
description: "The friends of the human, or an empty list if they " +
"have none.",
description: "The friends of the human, or an empty list if they " + "have none.",
resolve: { human, _, _, _ in
getFriends(character: human as! Human)
}
Expand DownExpand Up@@ -179,19 +174,17 @@ let HumanType = try! GraphQLObjectType(
}
)

/**
* The other type of character in Star Wars is a droid.
*
* This implements the following type system shorthand:
* type Droid : Character {
* id: String!
* name: String
* friends: [Character]
* appearsIn: [Episode]
* secretBackstory: String
* primaryFunction: String
* }
*/
/// The other type of character in Star Wars is a droid.
///
/// This implements the following type system shorthand:
/// type Droid : Character {
/// id: String!
/// name: String
/// friends: [Character]
/// appearsIn: [Episode]
/// secretBackstory: String
/// primaryFunction: String
/// }
let DroidType = try! GraphQLObjectType(
name: "Droid",
description: "A mechanical creature in the Star Wars universe.",
Expand DownExpand Up@@ -237,20 +230,17 @@ let DroidType = try! GraphQLObjectType(
}
)

/**
* This is the type that will be the root of our query, and the
* entry point into our schema. It gives us the ability to fetch
* objects by their IDs, as well as to fetch the undisputed hero
* of the Star Wars trilogy, R2-D2, directly.
*
* This implements the following type system shorthand:
* type Query {
* hero(episode: Episode): Character
* human(id: String!): Human
* droid(id: String!): Droid
* }
*
*/
/// This is the type that will be the root of our query, and the
/// entry point into our schema. It gives us the ability to fetch
/// objects by their IDs, as well as to fetch the undisputed hero
/// of the Star Wars trilogy, R2-D2, directly.
///
/// This implements the following type system shorthand:
/// type Query {
/// hero(episode: Episode): Character
/// human(id: String!): Human
/// droid(id: String!): Droid
/// }
let QueryType = try! GraphQLObjectType(
name: "Query",
fields: [
Expand All@@ -260,9 +250,9 @@ let QueryType = try! GraphQLObjectType(
"episode": GraphQLArgument(
type: EpisodeEnum,
description:
"If omitted, returns the hero of the whole saga. If " +
"provided, returns the hero of that particular episode."
),
"If omitted, returns the hero of the whole saga. If "
+ "provided, returns the hero of that particular episode."
)
],
resolve: { _, arguments, _, _ in
let episode = Episode(arguments["episode"].string)
Expand All@@ -275,7 +265,7 @@ let QueryType = try! GraphQLObjectType(
"id": GraphQLArgument(
type: GraphQLNonNull(GraphQLString),
description: "id of the human"
),
)
],
resolve: { _, arguments, _, _ in
getHuman(id: arguments["id"].string!)
Expand All@@ -287,7 +277,7 @@ let QueryType = try! GraphQLObjectType(
"id": GraphQLArgument(
type: GraphQLNonNull(GraphQLString),
description: "id of the droid"
),
)
],
resolve: { _, arguments, _, _ in
getDroid(id: arguments["id"].string!)
Expand All@@ -296,10 +286,8 @@ let QueryType = try! GraphQLObjectType(
]
)

/**
* Finally, we construct our schema (whose starting query type is the query
* type we defined above) and export it.
*/
/// Finally, we construct our schema (whose starting query type is the query
/// type we defined above) and export it.
let starWarsSchema = try! GraphQLSchema(
query: QueryType,
types: [HumanType, DroidType]
Expand Down
4 changes: 2 additions & 2 deletions Benchmarks/Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,9 @@ let package = Package(
],
path: "Benchmarks",
plugins: [
.plugin(name: "BenchmarkPlugin", package: "package-benchmark"),
.plugin(name: "BenchmarkPlugin", package: "package-benchmark")
]
),
)
],
swiftLanguageVersions: [.v5, .version("6")]
)
6 changes: 3 additions & 3 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,16 +5,16 @@ let package = Package(
name: "GraphQL",
platforms: [.macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6)],
products: [
.library(name: "GraphQL", targets: ["GraphQL"]),
.library(name: "GraphQL", targets: ["GraphQL"])
],
dependencies: [
.package(url: "https://github.com/apple/swift-collections", .upToNextMajor(from: "1.0.0")),
.package(url: "https://github.com/apple/swift-collections", .upToNextMajor(from: "1.0.0"))
],
targets: [
.target(
name: "GraphQL",
dependencies: [
.product(name: "OrderedCollections", package: "swift-collections"),
.product(name: "OrderedCollections", package: "swift-collections")
]
),
.testTarget(
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -124,11 +124,11 @@ Those contributing to this package are expected to follow the [Swift Code of Con
[Swift API Design Guidelines](https://swift.org/documentation/api-design-guidelines/), and the
[SSWG Technical Best Practices](https://github.com/swift-server/sswg/blob/main/process/incubation.md#technical-best-practices).

This repo uses [SwiftFormat](https://github.com/nicklockwood/SwiftFormat), and includes lint checks to enforce these formatting standards.
To format your code, install `swiftformat` and run:
This repo uses the standard [swift format](https://github.com/swiftlang/swift-format), and includes lint checks to enforce these formatting standards.
To format your code, run:

```bash
swiftformat .
swift format --parallel --in-place --recursive ./
```

Most of this repo mirrors the structure of
Expand Down
Loading
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .swift-format
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
{
"version": 1,
"indentation" : {
"spaces" : 4
},
"lineBreakBeforeEachArgument": true
}
14 changes: 7 additions & 7 deletions Benchmarks/Benchmarks/GraphQLBenchmarks.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,19 +6,19 @@ let benchmarks: @Sendable () -> Void = {
let result = try await graphql(
schema: starWarsSchema,
request: """
query NestedQuery {
hero {
name
friends {
query NestedQuery {
hero {
name
appearsIn
friends {
name
appearsIn
friends {
name
}
}
}
}
}
"""
"""
)
}
}
20 changes: 5 additions & 15 deletions Benchmarks/Benchmarks/StarWarsData.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,16 +126,12 @@ let droidData: [String: Droid] = [
"2001": r2d2,
]

/**
* Helper function to get a character by ID.
*/
/// Helper function to get a character by ID.
@Sendable func getCharacter(id: String) -> Character? {
return humanData[id] ?? droidData[id]
}

/**
* Allows us to query for a character"s friends.
*/
/// Allows us to query for a character"s friends.
@Sendable func getFriends(character: Character) -> [Character] {
return character.friends.reduce(into: []) { friends, friendID in
if let friend = getCharacter(id: friendID) {
Expand All@@ -144,9 +140,7 @@ let droidData: [String: Droid] = [
}
}

/**
* Allows us to fetch the undisputed hero of the Star Wars trilogy, R2-D2.
*/
/// Allows us to fetch the undisputed hero of the Star Wars trilogy, R2-D2.
@Sendable func getHero(episode: Episode?) -> Character {
if episode == .empire {
// Luke is the hero of Episode V.
Expand All@@ -156,16 +150,12 @@ let droidData: [String: Droid] = [
return r2d2
}

/**
* Allows us to query for the human with the given id.
*/
/// Allows us to query for the human with the given id.
@Sendable func getHuman(id: String) -> Human? {
return humanData[id]
}

/**
* Allows us to query for the droid with the given id.
*/
/// Allows us to query for the droid with the given id.
@Sendable func getDroid(id: String) -> Droid? {
return droidData[id]
}
168 changes: 78 additions & 90 deletions Benchmarks/Benchmarks/StarWarsSchema.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,12 +49,10 @@ import GraphQL
* We begin by setting up our schema.
*/

/**
* The original trilogy consists of three movies.
*
* This implements the following type system shorthand:
* enum Episode { NEWHOPE, EMPIRE, JEDI }
*/
/// The original trilogy consists of three movies.
///
/// This implements the following type system shorthand:
/// enum Episode { NEWHOPE, EMPIRE, JEDI }
let EpisodeEnum = try! GraphQLEnumType(
name: "Episode",
description: "One of the films in the Star Wars Trilogy",
Expand All@@ -74,43 +72,43 @@ let EpisodeEnum = try! GraphQLEnumType(
]
)

/**
* Characters in the Star Wars trilogy are either humans or droids.
*
* This implements the following type system shorthand:
* interface Character {
* id: String!
* name: String
* friends: [Character]
* appearsIn: [Episode]
* secretBackstory: String
* }
*/
/// Characters in the Star Wars trilogy are either humans or droids.
///
/// This implements the following type system shorthand:
/// interface Character {
/// id: String!
/// name: String
/// friends: [Character]
/// appearsIn: [Episode]
/// secretBackstory: String
/// }
let CharacterInterface = try! GraphQLInterfaceType(
name: "Character",
description: "A character in the Star Wars Trilogy",
fields: { [
"id": GraphQLField(
type: GraphQLNonNull(GraphQLString),
description: "The id of the character."
),
"name": GraphQLField(
type: GraphQLString,
description: "The name of the character."
),
"friends": GraphQLField(
type: GraphQLList(CharacterInterface),
description: "The friends of the character, or an empty list if they have none."
),
"appearsIn": GraphQLField(
type: GraphQLList(EpisodeEnum),
description: "Which movies they appear in."
),
"secretBackstory": GraphQLField(
type: GraphQLString,
description: "All secrets about their past."
),
] },
fields: {
[
"id": GraphQLField(
type: GraphQLNonNull(GraphQLString),
description: "The id of the character."
),
"name": GraphQLField(
type: GraphQLString,
description: "The name of the character."
),
"friends": GraphQLField(
type: GraphQLList(CharacterInterface),
description: "The friends of the character, or an empty list if they have none."
),
"appearsIn": GraphQLField(
type: GraphQLList(EpisodeEnum),
description: "Which movies they appear in."
),
"secretBackstory": GraphQLField(
type: GraphQLString,
description: "All secrets about their past."
),
]
},
resolveType: { character, _ in
switch character {
case is Human:
Expand All@@ -121,18 +119,16 @@ let CharacterInterface = try! GraphQLInterfaceType(
}
)

/**
* We define our human type, which implements the character interface.
*
* This implements the following type system shorthand:
* type Human : Character {
* id: String!
* name: String
* friends: [Character]
* appearsIn: [Episode]
* secretBackstory: String
* }
*/
/// We define our human type, which implements the character interface.
///
/// This implements the following type system shorthand:
/// type Human : Character {
/// id: String!
/// name: String
/// friends: [Character]
/// appearsIn: [Episode]
/// secretBackstory: String
/// }
let HumanType = try! GraphQLObjectType(
name: "Human",
description: "A humanoid creature in the Star Wars universe.",
Expand All@@ -147,8 +143,7 @@ let HumanType = try! GraphQLObjectType(
),
"friends": GraphQLField(
type: GraphQLList(CharacterInterface),
description: "The friends of the human, or an empty list if they " +
"have none.",
description: "The friends of the human, or an empty list if they " + "have none.",
resolve: { human, _, _, _ in
getFriends(character: human as! Human)
}
Expand DownExpand Up@@ -179,19 +174,17 @@ let HumanType = try! GraphQLObjectType(
}
)

/**
* The other type of character in Star Wars is a droid.
*
* This implements the following type system shorthand:
* type Droid : Character {
* id: String!
* name: String
* friends: [Character]
* appearsIn: [Episode]
* secretBackstory: String
* primaryFunction: String
* }
*/
/// The other type of character in Star Wars is a droid.
///
/// This implements the following type system shorthand:
/// type Droid : Character {
/// id: String!
/// name: String
/// friends: [Character]
/// appearsIn: [Episode]
/// secretBackstory: String
/// primaryFunction: String
/// }
let DroidType = try! GraphQLObjectType(
name: "Droid",
description: "A mechanical creature in the Star Wars universe.",
Expand DownExpand Up@@ -237,20 +230,17 @@ let DroidType = try! GraphQLObjectType(
}
)

/**
* This is the type that will be the root of our query, and the
* entry point into our schema. It gives us the ability to fetch
* objects by their IDs, as well as to fetch the undisputed hero
* of the Star Wars trilogy, R2-D2, directly.
*
* This implements the following type system shorthand:
* type Query {
* hero(episode: Episode): Character
* human(id: String!): Human
* droid(id: String!): Droid
* }
*
*/
/// This is the type that will be the root of our query, and the
/// entry point into our schema. It gives us the ability to fetch
/// objects by their IDs, as well as to fetch the undisputed hero
/// of the Star Wars trilogy, R2-D2, directly.
///
/// This implements the following type system shorthand:
/// type Query {
/// hero(episode: Episode): Character
/// human(id: String!): Human
/// droid(id: String!): Droid
/// }
let QueryType = try! GraphQLObjectType(
name: "Query",
fields: [
Expand All@@ -260,9 +250,9 @@ let QueryType = try! GraphQLObjectType(
"episode": GraphQLArgument(
type: EpisodeEnum,
description:
"If omitted, returns the hero of the whole saga. If " +
"provided, returns the hero of that particular episode."
),
"If omitted, returns the hero of the whole saga. If "
+ "provided, returns the hero of that particular episode."
)
],
resolve: { _, arguments, _, _ in
let episode = Episode(arguments["episode"].string)
Expand All@@ -275,7 +265,7 @@ let QueryType = try! GraphQLObjectType(
"id": GraphQLArgument(
type: GraphQLNonNull(GraphQLString),
description: "id of the human"
),
)
],
resolve: { _, arguments, _, _ in
getHuman(id: arguments["id"].string!)
Expand All@@ -287,7 +277,7 @@ let QueryType = try! GraphQLObjectType(
"id": GraphQLArgument(
type: GraphQLNonNull(GraphQLString),
description: "id of the droid"
),
)
],
resolve: { _, arguments, _, _ in
getDroid(id: arguments["id"].string!)
Expand All@@ -296,10 +286,8 @@ let QueryType = try! GraphQLObjectType(
]
)

/**
* Finally, we construct our schema (whose starting query type is the query
* type we defined above) and export it.
*/
/// Finally, we construct our schema (whose starting query type is the query
/// type we defined above) and export it.
let starWarsSchema = try! GraphQLSchema(
query: QueryType,
types: [HumanType, DroidType]
Expand Down
4 changes: 2 additions & 2 deletions Benchmarks/Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,9 @@ let package = Package(
],
path: "Benchmarks",
plugins: [
.plugin(name: "BenchmarkPlugin", package: "package-benchmark"),
.plugin(name: "BenchmarkPlugin", package: "package-benchmark")
]
),
)
],
swiftLanguageVersions: [.v5, .version("6")]
)
6 changes: 3 additions & 3 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,16 +5,16 @@ let package = Package(
name: "GraphQL",
platforms: [.macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6)],
products: [
.library(name: "GraphQL", targets: ["GraphQL"]),
.library(name: "GraphQL", targets: ["GraphQL"])
],
dependencies: [
.package(url: "https://github.com/apple/swift-collections", .upToNextMajor(from: "1.0.0")),
.package(url: "https://github.com/apple/swift-collections", .upToNextMajor(from: "1.0.0"))
],
targets: [
.target(
name: "GraphQL",
dependencies: [
.product(name: "OrderedCollections", package: "swift-collections"),
.product(name: "OrderedCollections", package: "swift-collections")
]
),
.testTarget(
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -124,11 +124,11 @@ Those contributing to this package are expected to follow the [Swift Code of Con
[Swift API Design Guidelines](https://swift.org/documentation/api-design-guidelines/), and the
[SSWG Technical Best Practices](https://github.com/swift-server/sswg/blob/main/process/incubation.md#technical-best-practices).

This repo uses [SwiftFormat](https://github.com/nicklockwood/SwiftFormat), and includes lint checks to enforce these formatting standards.
To format your code, install `swiftformat` and run:
This repo uses the standard [swift format](https://github.com/swiftlang/swift-format), and includes lint checks to enforce these formatting standards.
To format your code, run:

```bash
swiftformat .
swift format --parallel --in-place --recursive ./
```

Most of this repo mirrors the structure of
Expand Down
Loading
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .swift-format
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
{
"version": 1,
"indentation" : {
"spaces" : 4
},
"lineBreakBeforeEachArgument": true
}
14 changes: 7 additions & 7 deletions Benchmarks/Benchmarks/GraphQLBenchmarks.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,19 +6,19 @@ let benchmarks: @Sendable () -> Void = {
let result = try await graphql(
schema: starWarsSchema,
request: """
query NestedQuery {
hero {
name
friends {
query NestedQuery {
hero {
name
appearsIn
friends {
name
appearsIn
friends {
name
}
}
}
}
}
"""
"""
)
}
}
20 changes: 5 additions & 15 deletions Benchmarks/Benchmarks/StarWarsData.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,16 +126,12 @@ let droidData: [String: Droid] = [
"2001": r2d2,
]

/**
* Helper function to get a character by ID.
*/
/// Helper function to get a character by ID.
@Sendable func getCharacter(id: String) -> Character? {
return humanData[id] ?? droidData[id]
}

/**
* Allows us to query for a character"s friends.
*/
/// Allows us to query for a character"s friends.
@Sendable func getFriends(character: Character) -> [Character] {
return character.friends.reduce(into: []) { friends, friendID in
if let friend = getCharacter(id: friendID) {
Expand All@@ -144,9 +140,7 @@ let droidData: [String: Droid] = [
}
}

/**
* Allows us to fetch the undisputed hero of the Star Wars trilogy, R2-D2.
*/
/// Allows us to fetch the undisputed hero of the Star Wars trilogy, R2-D2.
@Sendable func getHero(episode: Episode?) -> Character {
if episode == .empire {
// Luke is the hero of Episode V.
Expand All@@ -156,16 +150,12 @@ let droidData: [String: Droid] = [
return r2d2
}

/**
* Allows us to query for the human with the given id.
*/
/// Allows us to query for the human with the given id.
@Sendable func getHuman(id: String) -> Human? {
return humanData[id]
}

/**
* Allows us to query for the droid with the given id.
*/
/// Allows us to query for the droid with the given id.
@Sendable func getDroid(id: String) -> Droid? {
return droidData[id]
}
168 changes: 78 additions & 90 deletions Benchmarks/Benchmarks/StarWarsSchema.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,12 +49,10 @@ import GraphQL
* We begin by setting up our schema.
*/

/**
* The original trilogy consists of three movies.
*
* This implements the following type system shorthand:
* enum Episode { NEWHOPE, EMPIRE, JEDI }
*/
/// The original trilogy consists of three movies.
///
/// This implements the following type system shorthand:
/// enum Episode { NEWHOPE, EMPIRE, JEDI }
let EpisodeEnum = try! GraphQLEnumType(
name: "Episode",
description: "One of the films in the Star Wars Trilogy",
Expand All@@ -74,43 +72,43 @@ let EpisodeEnum = try! GraphQLEnumType(
]
)

/**
* Characters in the Star Wars trilogy are either humans or droids.
*
* This implements the following type system shorthand:
* interface Character {
* id: String!
* name: String
* friends: [Character]
* appearsIn: [Episode]
* secretBackstory: String
* }
*/
/// Characters in the Star Wars trilogy are either humans or droids.
///
/// This implements the following type system shorthand:
/// interface Character {
/// id: String!
/// name: String
/// friends: [Character]
/// appearsIn: [Episode]
/// secretBackstory: String
/// }
let CharacterInterface = try! GraphQLInterfaceType(
name: "Character",
description: "A character in the Star Wars Trilogy",
fields: { [
"id": GraphQLField(
type: GraphQLNonNull(GraphQLString),
description: "The id of the character."
),
"name": GraphQLField(
type: GraphQLString,
description: "The name of the character."
),
"friends": GraphQLField(
type: GraphQLList(CharacterInterface),
description: "The friends of the character, or an empty list if they have none."
),
"appearsIn": GraphQLField(
type: GraphQLList(EpisodeEnum),
description: "Which movies they appear in."
),
"secretBackstory": GraphQLField(
type: GraphQLString,
description: "All secrets about their past."
),
] },
fields: {
[
"id": GraphQLField(
type: GraphQLNonNull(GraphQLString),
description: "The id of the character."
),
"name": GraphQLField(
type: GraphQLString,
description: "The name of the character."
),
"friends": GraphQLField(
type: GraphQLList(CharacterInterface),
description: "The friends of the character, or an empty list if they have none."
),
"appearsIn": GraphQLField(
type: GraphQLList(EpisodeEnum),
description: "Which movies they appear in."
),
"secretBackstory": GraphQLField(
type: GraphQLString,
description: "All secrets about their past."
),
]
},
resolveType: { character, _ in
switch character {
case is Human:
Expand All@@ -121,18 +119,16 @@ let CharacterInterface = try! GraphQLInterfaceType(
}
)

/**
* We define our human type, which implements the character interface.
*
* This implements the following type system shorthand:
* type Human : Character {
* id: String!
* name: String
* friends: [Character]
* appearsIn: [Episode]
* secretBackstory: String
* }
*/
/// We define our human type, which implements the character interface.
///
/// This implements the following type system shorthand:
/// type Human : Character {
/// id: String!
/// name: String
/// friends: [Character]
/// appearsIn: [Episode]
/// secretBackstory: String
/// }
let HumanType = try! GraphQLObjectType(
name: "Human",
description: "A humanoid creature in the Star Wars universe.",
Expand All@@ -147,8 +143,7 @@ let HumanType = try! GraphQLObjectType(
),
"friends": GraphQLField(
type: GraphQLList(CharacterInterface),
description: "The friends of the human, or an empty list if they " +
"have none.",
description: "The friends of the human, or an empty list if they " + "have none.",
resolve: { human, _, _, _ in
getFriends(character: human as! Human)
}
Expand DownExpand Up@@ -179,19 +174,17 @@ let HumanType = try! GraphQLObjectType(
}
)

/**
* The other type of character in Star Wars is a droid.
*
* This implements the following type system shorthand:
* type Droid : Character {
* id: String!
* name: String
* friends: [Character]
* appearsIn: [Episode]
* secretBackstory: String
* primaryFunction: String
* }
*/
/// The other type of character in Star Wars is a droid.
///
/// This implements the following type system shorthand:
/// type Droid : Character {
/// id: String!
/// name: String
/// friends: [Character]
/// appearsIn: [Episode]
/// secretBackstory: String
/// primaryFunction: String
/// }
let DroidType = try! GraphQLObjectType(
name: "Droid",
description: "A mechanical creature in the Star Wars universe.",
Expand DownExpand Up@@ -237,20 +230,17 @@ let DroidType = try! GraphQLObjectType(
}
)

/**
* This is the type that will be the root of our query, and the
* entry point into our schema. It gives us the ability to fetch
* objects by their IDs, as well as to fetch the undisputed hero
* of the Star Wars trilogy, R2-D2, directly.
*
* This implements the following type system shorthand:
* type Query {
* hero(episode: Episode): Character
* human(id: String!): Human
* droid(id: String!): Droid
* }
*
*/
/// This is the type that will be the root of our query, and the
/// entry point into our schema. It gives us the ability to fetch
/// objects by their IDs, as well as to fetch the undisputed hero
/// of the Star Wars trilogy, R2-D2, directly.
///
/// This implements the following type system shorthand:
/// type Query {
/// hero(episode: Episode): Character
/// human(id: String!): Human
/// droid(id: String!): Droid
/// }
let QueryType = try! GraphQLObjectType(
name: "Query",
fields: [
Expand All@@ -260,9 +250,9 @@ let QueryType = try! GraphQLObjectType(
"episode": GraphQLArgument(
type: EpisodeEnum,
description:
"If omitted, returns the hero of the whole saga. If " +
"provided, returns the hero of that particular episode."
),
"If omitted, returns the hero of the whole saga. If "
+ "provided, returns the hero of that particular episode."
)
],
resolve: { _, arguments, _, _ in
let episode = Episode(arguments["episode"].string)
Expand All@@ -275,7 +265,7 @@ let QueryType = try! GraphQLObjectType(
"id": GraphQLArgument(
type: GraphQLNonNull(GraphQLString),
description: "id of the human"
),
)
],
resolve: { _, arguments, _, _ in
getHuman(id: arguments["id"].string!)
Expand All@@ -287,7 +277,7 @@ let QueryType = try! GraphQLObjectType(
"id": GraphQLArgument(
type: GraphQLNonNull(GraphQLString),
description: "id of the droid"
),
)
],
resolve: { _, arguments, _, _ in
getDroid(id: arguments["id"].string!)
Expand All@@ -296,10 +286,8 @@ let QueryType = try! GraphQLObjectType(
]
)

/**
* Finally, we construct our schema (whose starting query type is the query
* type we defined above) and export it.
*/
/// Finally, we construct our schema (whose starting query type is the query
/// type we defined above) and export it.
let starWarsSchema = try! GraphQLSchema(
query: QueryType,
types: [HumanType, DroidType]
Expand Down
4 changes: 2 additions & 2 deletions Benchmarks/Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,9 @@ let package = Package(
],
path: "Benchmarks",
plugins: [
.plugin(name: "BenchmarkPlugin", package: "package-benchmark"),
.plugin(name: "BenchmarkPlugin", package: "package-benchmark")
]
),
)
],
swiftLanguageVersions: [.v5, .version("6")]
)
6 changes: 3 additions & 3 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,16 +5,16 @@ let package = Package(
name: "GraphQL",
platforms: [.macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6)],
products: [
.library(name: "GraphQL", targets: ["GraphQL"]),
.library(name: "GraphQL", targets: ["GraphQL"])
],
dependencies: [
.package(url: "https://github.com/apple/swift-collections", .upToNextMajor(from: "1.0.0")),
.package(url: "https://github.com/apple/swift-collections", .upToNextMajor(from: "1.0.0"))
],
targets: [
.target(
name: "GraphQL",
dependencies: [
.product(name: "OrderedCollections", package: "swift-collections"),
.product(name: "OrderedCollections", package: "swift-collections")
]
),
.testTarget(
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -124,11 +124,11 @@ Those contributing to this package are expected to follow the [Swift Code of Con
[Swift API Design Guidelines](https://swift.org/documentation/api-design-guidelines/), and the
[SSWG Technical Best Practices](https://github.com/swift-server/sswg/blob/main/process/incubation.md#technical-best-practices).

This repo uses [SwiftFormat](https://github.com/nicklockwood/SwiftFormat), and includes lint checks to enforce these formatting standards.
To format your code, install `swiftformat` and run:
This repo uses the standard [swift format](https://github.com/swiftlang/swift-format), and includes lint checks to enforce these formatting standards.
To format your code, run:

```bash
swiftformat .
swift format --parallel --in-place --recursive ./
```

Most of this repo mirrors the structure of
Expand Down
Loading
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .swift-format
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
{
"version": 1,
"indentation" : {
"spaces" : 4
},
"lineBreakBeforeEachArgument": true
}
14 changes: 7 additions & 7 deletions Benchmarks/Benchmarks/GraphQLBenchmarks.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,19 +6,19 @@ let benchmarks: @Sendable () -> Void = {
let result = try await graphql(
schema: starWarsSchema,
request: """
query NestedQuery {
hero {
name
friends {
query NestedQuery {
hero {
name
appearsIn
friends {
name
appearsIn
friends {
name
}
}
}
}
}
"""
"""
)
}
}
20 changes: 5 additions & 15 deletions Benchmarks/Benchmarks/StarWarsData.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,16 +126,12 @@ let droidData: [String: Droid] = [
"2001": r2d2,
]

/**
* Helper function to get a character by ID.
*/
/// Helper function to get a character by ID.
@Sendable func getCharacter(id: String) -> Character? {
return humanData[id] ?? droidData[id]
}

/**
* Allows us to query for a character"s friends.
*/
/// Allows us to query for a character"s friends.
@Sendable func getFriends(character: Character) -> [Character] {
return character.friends.reduce(into: []) { friends, friendID in
if let friend = getCharacter(id: friendID) {
Expand All@@ -144,9 +140,7 @@ let droidData: [String: Droid] = [
}
}

/**
* Allows us to fetch the undisputed hero of the Star Wars trilogy, R2-D2.
*/
/// Allows us to fetch the undisputed hero of the Star Wars trilogy, R2-D2.
@Sendable func getHero(episode: Episode?) -> Character {
if episode == .empire {
// Luke is the hero of Episode V.
Expand All@@ -156,16 +150,12 @@ let droidData: [String: Droid] = [
return r2d2
}

/**
* Allows us to query for the human with the given id.
*/
/// Allows us to query for the human with the given id.
@Sendable func getHuman(id: String) -> Human? {
return humanData[id]
}

/**
* Allows us to query for the droid with the given id.
*/
/// Allows us to query for the droid with the given id.
@Sendable func getDroid(id: String) -> Droid? {
return droidData[id]
}
168 changes: 78 additions & 90 deletions Benchmarks/Benchmarks/StarWarsSchema.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,12 +49,10 @@ import GraphQL
* We begin by setting up our schema.
*/

/**
* The original trilogy consists of three movies.
*
* This implements the following type system shorthand:
* enum Episode { NEWHOPE, EMPIRE, JEDI }
*/
/// The original trilogy consists of three movies.
///
/// This implements the following type system shorthand:
/// enum Episode { NEWHOPE, EMPIRE, JEDI }
let EpisodeEnum = try! GraphQLEnumType(
name: "Episode",
description: "One of the films in the Star Wars Trilogy",
Expand All@@ -74,43 +72,43 @@ let EpisodeEnum = try! GraphQLEnumType(
]
)

/**
* Characters in the Star Wars trilogy are either humans or droids.
*
* This implements the following type system shorthand:
* interface Character {
* id: String!
* name: String
* friends: [Character]
* appearsIn: [Episode]
* secretBackstory: String
* }
*/
/// Characters in the Star Wars trilogy are either humans or droids.
///
/// This implements the following type system shorthand:
/// interface Character {
/// id: String!
/// name: String
/// friends: [Character]
/// appearsIn: [Episode]
/// secretBackstory: String
/// }
let CharacterInterface = try! GraphQLInterfaceType(
name: "Character",
description: "A character in the Star Wars Trilogy",
fields: { [
"id": GraphQLField(
type: GraphQLNonNull(GraphQLString),
description: "The id of the character."
),
"name": GraphQLField(
type: GraphQLString,
description: "The name of the character."
),
"friends": GraphQLField(
type: GraphQLList(CharacterInterface),
description: "The friends of the character, or an empty list if they have none."
),
"appearsIn": GraphQLField(
type: GraphQLList(EpisodeEnum),
description: "Which movies they appear in."
),
"secretBackstory": GraphQLField(
type: GraphQLString,
description: "All secrets about their past."
),
] },
fields: {
[
"id": GraphQLField(
type: GraphQLNonNull(GraphQLString),
description: "The id of the character."
),
"name": GraphQLField(
type: GraphQLString,
description: "The name of the character."
),
"friends": GraphQLField(
type: GraphQLList(CharacterInterface),
description: "The friends of the character, or an empty list if they have none."
),
"appearsIn": GraphQLField(
type: GraphQLList(EpisodeEnum),
description: "Which movies they appear in."
),
"secretBackstory": GraphQLField(
type: GraphQLString,
description: "All secrets about their past."
),
]
},
resolveType: { character, _ in
switch character {
case is Human:
Expand All@@ -121,18 +119,16 @@ let CharacterInterface = try! GraphQLInterfaceType(
}
)

/**
* We define our human type, which implements the character interface.
*
* This implements the following type system shorthand:
* type Human : Character {
* id: String!
* name: String
* friends: [Character]
* appearsIn: [Episode]
* secretBackstory: String
* }
*/
/// We define our human type, which implements the character interface.
///
/// This implements the following type system shorthand:
/// type Human : Character {
/// id: String!
/// name: String
/// friends: [Character]
/// appearsIn: [Episode]
/// secretBackstory: String
/// }
let HumanType = try! GraphQLObjectType(
name: "Human",
description: "A humanoid creature in the Star Wars universe.",
Expand All@@ -147,8 +143,7 @@ let HumanType = try! GraphQLObjectType(
),
"friends": GraphQLField(
type: GraphQLList(CharacterInterface),
description: "The friends of the human, or an empty list if they " +
"have none.",
description: "The friends of the human, or an empty list if they " + "have none.",
resolve: { human, _, _, _ in
getFriends(character: human as! Human)
}
Expand DownExpand Up@@ -179,19 +174,17 @@ let HumanType = try! GraphQLObjectType(
}
)

/**
* The other type of character in Star Wars is a droid.
*
* This implements the following type system shorthand:
* type Droid : Character {
* id: String!
* name: String
* friends: [Character]
* appearsIn: [Episode]
* secretBackstory: String
* primaryFunction: String
* }
*/
/// The other type of character in Star Wars is a droid.
///
/// This implements the following type system shorthand:
/// type Droid : Character {
/// id: String!
/// name: String
/// friends: [Character]
/// appearsIn: [Episode]
/// secretBackstory: String
/// primaryFunction: String
/// }
let DroidType = try! GraphQLObjectType(
name: "Droid",
description: "A mechanical creature in the Star Wars universe.",
Expand DownExpand Up@@ -237,20 +230,17 @@ let DroidType = try! GraphQLObjectType(
}
)

/**
* This is the type that will be the root of our query, and the
* entry point into our schema. It gives us the ability to fetch
* objects by their IDs, as well as to fetch the undisputed hero
* of the Star Wars trilogy, R2-D2, directly.
*
* This implements the following type system shorthand:
* type Query {
* hero(episode: Episode): Character
* human(id: String!): Human
* droid(id: String!): Droid
* }
*
*/
/// This is the type that will be the root of our query, and the
/// entry point into our schema. It gives us the ability to fetch
/// objects by their IDs, as well as to fetch the undisputed hero
/// of the Star Wars trilogy, R2-D2, directly.
///
/// This implements the following type system shorthand:
/// type Query {
/// hero(episode: Episode): Character
/// human(id: String!): Human
/// droid(id: String!): Droid
/// }
let QueryType = try! GraphQLObjectType(
name: "Query",
fields: [
Expand All@@ -260,9 +250,9 @@ let QueryType = try! GraphQLObjectType(
"episode": GraphQLArgument(
type: EpisodeEnum,
description:
"If omitted, returns the hero of the whole saga. If " +
"provided, returns the hero of that particular episode."
),
"If omitted, returns the hero of the whole saga. If "
+ "provided, returns the hero of that particular episode."
)
],
resolve: { _, arguments, _, _ in
let episode = Episode(arguments["episode"].string)
Expand All@@ -275,7 +265,7 @@ let QueryType = try! GraphQLObjectType(
"id": GraphQLArgument(
type: GraphQLNonNull(GraphQLString),
description: "id of the human"
),
)
],
resolve: { _, arguments, _, _ in
getHuman(id: arguments["id"].string!)
Expand All@@ -287,7 +277,7 @@ let QueryType = try! GraphQLObjectType(
"id": GraphQLArgument(
type: GraphQLNonNull(GraphQLString),
description: "id of the droid"
),
)
],
resolve: { _, arguments, _, _ in
getDroid(id: arguments["id"].string!)
Expand All@@ -296,10 +286,8 @@ let QueryType = try! GraphQLObjectType(
]
)

/**
* Finally, we construct our schema (whose starting query type is the query
* type we defined above) and export it.
*/
/// Finally, we construct our schema (whose starting query type is the query
/// type we defined above) and export it.
let starWarsSchema = try! GraphQLSchema(
query: QueryType,
types: [HumanType, DroidType]
Expand Down
4 changes: 2 additions & 2 deletions Benchmarks/Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,9 @@ let package = Package(
],
path: "Benchmarks",
plugins: [
.plugin(name: "BenchmarkPlugin", package: "package-benchmark"),
.plugin(name: "BenchmarkPlugin", package: "package-benchmark")
]
),
)
],
swiftLanguageVersions: [.v5, .version("6")]
)
6 changes: 3 additions & 3 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,16 +5,16 @@ let package = Package(
name: "GraphQL",
platforms: [.macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6)],
products: [
.library(name: "GraphQL", targets: ["GraphQL"]),
.library(name: "GraphQL", targets: ["GraphQL"])
],
dependencies: [
.package(url: "https://github.com/apple/swift-collections", .upToNextMajor(from: "1.0.0")),
.package(url: "https://github.com/apple/swift-collections", .upToNextMajor(from: "1.0.0"))
],
targets: [
.target(
name: "GraphQL",
dependencies: [
.product(name: "OrderedCollections", package: "swift-collections"),
.product(name: "OrderedCollections", package: "swift-collections")
]
),
.testTarget(
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -124,11 +124,11 @@ Those contributing to this package are expected to follow the [Swift Code of Con
[Swift API Design Guidelines](https://swift.org/documentation/api-design-guidelines/), and the
[SSWG Technical Best Practices](https://github.com/swift-server/sswg/blob/main/process/incubation.md#technical-best-practices).

This repo uses [SwiftFormat](https://github.com/nicklockwood/SwiftFormat), and includes lint checks to enforce these formatting standards.
To format your code, install `swiftformat` and run:
This repo uses the standard [swift format](https://github.com/swiftlang/swift-format), and includes lint checks to enforce these formatting standards.
To format your code, run:

```bash
swiftformat .
swift format --parallel --in-place --recursive ./
```

Most of this repo mirrors the structure of
Expand Down
Loading
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .swift-format
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
{
"version": 1,
"indentation" : {
"spaces" : 4
},
"lineBreakBeforeEachArgument": true
}
14 changes: 7 additions & 7 deletions Benchmarks/Benchmarks/GraphQLBenchmarks.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,19 +6,19 @@ let benchmarks: @Sendable () -> Void = {
let result = try await graphql(
schema: starWarsSchema,
request: """
query NestedQuery {
hero {
name
friends {
query NestedQuery {
hero {
name
appearsIn
friends {
name
appearsIn
friends {
name
}
}
}
}
}
"""
"""
)
}
}
20 changes: 5 additions & 15 deletions Benchmarks/Benchmarks/StarWarsData.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,16 +126,12 @@ let droidData: [String: Droid] = [
"2001": r2d2,
]

/**
* Helper function to get a character by ID.
*/
/// Helper function to get a character by ID.
@Sendable func getCharacter(id: String) -> Character? {
return humanData[id] ?? droidData[id]
}

/**
* Allows us to query for a character"s friends.
*/
/// Allows us to query for a character"s friends.
@Sendable func getFriends(character: Character) -> [Character] {
return character.friends.reduce(into: []) { friends, friendID in
if let friend = getCharacter(id: friendID) {
Expand All@@ -144,9 +140,7 @@ let droidData: [String: Droid] = [
}
}

/**
* Allows us to fetch the undisputed hero of the Star Wars trilogy, R2-D2.
*/
/// Allows us to fetch the undisputed hero of the Star Wars trilogy, R2-D2.
@Sendable func getHero(episode: Episode?) -> Character {
if episode == .empire {
// Luke is the hero of Episode V.
Expand All@@ -156,16 +150,12 @@ let droidData: [String: Droid] = [
return r2d2
}

/**
* Allows us to query for the human with the given id.
*/
/// Allows us to query for the human with the given id.
@Sendable func getHuman(id: String) -> Human? {
return humanData[id]
}

/**
* Allows us to query for the droid with the given id.
*/
/// Allows us to query for the droid with the given id.
@Sendable func getDroid(id: String) -> Droid? {
return droidData[id]
}
168 changes: 78 additions & 90 deletions Benchmarks/Benchmarks/StarWarsSchema.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,12 +49,10 @@ import GraphQL
* We begin by setting up our schema.
*/

/**
* The original trilogy consists of three movies.
*
* This implements the following type system shorthand:
* enum Episode { NEWHOPE, EMPIRE, JEDI }
*/
/// The original trilogy consists of three movies.
///
/// This implements the following type system shorthand:
/// enum Episode { NEWHOPE, EMPIRE, JEDI }
let EpisodeEnum = try! GraphQLEnumType(
name: "Episode",
description: "One of the films in the Star Wars Trilogy",
Expand All@@ -74,43 +72,43 @@ let EpisodeEnum = try! GraphQLEnumType(
]
)

/**
* Characters in the Star Wars trilogy are either humans or droids.
*
* This implements the following type system shorthand:
* interface Character {
* id: String!
* name: String
* friends: [Character]
* appearsIn: [Episode]
* secretBackstory: String
* }
*/
/// Characters in the Star Wars trilogy are either humans or droids.
///
/// This implements the following type system shorthand:
/// interface Character {
/// id: String!
/// name: String
/// friends: [Character]
/// appearsIn: [Episode]
/// secretBackstory: String
/// }
let CharacterInterface = try! GraphQLInterfaceType(
name: "Character",
description: "A character in the Star Wars Trilogy",
fields: { [
"id": GraphQLField(
type: GraphQLNonNull(GraphQLString),
description: "The id of the character."
),
"name": GraphQLField(
type: GraphQLString,
description: "The name of the character."
),
"friends": GraphQLField(
type: GraphQLList(CharacterInterface),
description: "The friends of the character, or an empty list if they have none."
),
"appearsIn": GraphQLField(
type: GraphQLList(EpisodeEnum),
description: "Which movies they appear in."
),
"secretBackstory": GraphQLField(
type: GraphQLString,
description: "All secrets about their past."
),
] },
fields: {
[
"id": GraphQLField(
type: GraphQLNonNull(GraphQLString),
description: "The id of the character."
),
"name": GraphQLField(
type: GraphQLString,
description: "The name of the character."
),
"friends": GraphQLField(
type: GraphQLList(CharacterInterface),
description: "The friends of the character, or an empty list if they have none."
),
"appearsIn": GraphQLField(
type: GraphQLList(EpisodeEnum),
description: "Which movies they appear in."
),
"secretBackstory": GraphQLField(
type: GraphQLString,
description: "All secrets about their past."
),
]
},
resolveType: { character, _ in
switch character {
case is Human:
Expand All@@ -121,18 +119,16 @@ let CharacterInterface = try! GraphQLInterfaceType(
}
)

/**
* We define our human type, which implements the character interface.
*
* This implements the following type system shorthand:
* type Human : Character {
* id: String!
* name: String
* friends: [Character]
* appearsIn: [Episode]
* secretBackstory: String
* }
*/
/// We define our human type, which implements the character interface.
///
/// This implements the following type system shorthand:
/// type Human : Character {
/// id: String!
/// name: String
/// friends: [Character]
/// appearsIn: [Episode]
/// secretBackstory: String
/// }
let HumanType = try! GraphQLObjectType(
name: "Human",
description: "A humanoid creature in the Star Wars universe.",
Expand All@@ -147,8 +143,7 @@ let HumanType = try! GraphQLObjectType(
),
"friends": GraphQLField(
type: GraphQLList(CharacterInterface),
description: "The friends of the human, or an empty list if they " +
"have none.",
description: "The friends of the human, or an empty list if they " + "have none.",
resolve: { human, _, _, _ in
getFriends(character: human as! Human)
}
Expand DownExpand Up@@ -179,19 +174,17 @@ let HumanType = try! GraphQLObjectType(
}
)

/**
* The other type of character in Star Wars is a droid.
*
* This implements the following type system shorthand:
* type Droid : Character {
* id: String!
* name: String
* friends: [Character]
* appearsIn: [Episode]
* secretBackstory: String
* primaryFunction: String
* }
*/
/// The other type of character in Star Wars is a droid.
///
/// This implements the following type system shorthand:
/// type Droid : Character {
/// id: String!
/// name: String
/// friends: [Character]
/// appearsIn: [Episode]
/// secretBackstory: String
/// primaryFunction: String
/// }
let DroidType = try! GraphQLObjectType(
name: "Droid",
description: "A mechanical creature in the Star Wars universe.",
Expand DownExpand Up@@ -237,20 +230,17 @@ let DroidType = try! GraphQLObjectType(
}
)

/**
* This is the type that will be the root of our query, and the
* entry point into our schema. It gives us the ability to fetch
* objects by their IDs, as well as to fetch the undisputed hero
* of the Star Wars trilogy, R2-D2, directly.
*
* This implements the following type system shorthand:
* type Query {
* hero(episode: Episode): Character
* human(id: String!): Human
* droid(id: String!): Droid
* }
*
*/
/// This is the type that will be the root of our query, and the
/// entry point into our schema. It gives us the ability to fetch
/// objects by their IDs, as well as to fetch the undisputed hero
/// of the Star Wars trilogy, R2-D2, directly.
///
/// This implements the following type system shorthand:
/// type Query {
/// hero(episode: Episode): Character
/// human(id: String!): Human
/// droid(id: String!): Droid
/// }
let QueryType = try! GraphQLObjectType(
name: "Query",
fields: [
Expand All@@ -260,9 +250,9 @@ let QueryType = try! GraphQLObjectType(
"episode": GraphQLArgument(
type: EpisodeEnum,
description:
"If omitted, returns the hero of the whole saga. If " +
"provided, returns the hero of that particular episode."
),
"If omitted, returns the hero of the whole saga. If "
+ "provided, returns the hero of that particular episode."
)
],
resolve: { _, arguments, _, _ in
let episode = Episode(arguments["episode"].string)
Expand All@@ -275,7 +265,7 @@ let QueryType = try! GraphQLObjectType(
"id": GraphQLArgument(
type: GraphQLNonNull(GraphQLString),
description: "id of the human"
),
)
],
resolve: { _, arguments, _, _ in
getHuman(id: arguments["id"].string!)
Expand All@@ -287,7 +277,7 @@ let QueryType = try! GraphQLObjectType(
"id": GraphQLArgument(
type: GraphQLNonNull(GraphQLString),
description: "id of the droid"
),
)
],
resolve: { _, arguments, _, _ in
getDroid(id: arguments["id"].string!)
Expand All@@ -296,10 +286,8 @@ let QueryType = try! GraphQLObjectType(
]
)

/**
* Finally, we construct our schema (whose starting query type is the query
* type we defined above) and export it.
*/
/// Finally, we construct our schema (whose starting query type is the query
/// type we defined above) and export it.
let starWarsSchema = try! GraphQLSchema(
query: QueryType,
types: [HumanType, DroidType]
Expand Down
4 changes: 2 additions & 2 deletions Benchmarks/Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,9 @@ let package = Package(
],
path: "Benchmarks",
plugins: [
.plugin(name: "BenchmarkPlugin", package: "package-benchmark"),
.plugin(name: "BenchmarkPlugin", package: "package-benchmark")
]
),
)
],
swiftLanguageVersions: [.v5, .version("6")]
)
6 changes: 3 additions & 3 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,16 +5,16 @@ let package = Package(
name: "GraphQL",
platforms: [.macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6)],
products: [
.library(name: "GraphQL", targets: ["GraphQL"]),
.library(name: "GraphQL", targets: ["GraphQL"])
],
dependencies: [
.package(url: "https://github.com/apple/swift-collections", .upToNextMajor(from: "1.0.0")),
.package(url: "https://github.com/apple/swift-collections", .upToNextMajor(from: "1.0.0"))
],
targets: [
.target(
name: "GraphQL",
dependencies: [
.product(name: "OrderedCollections", package: "swift-collections"),
.product(name: "OrderedCollections", package: "swift-collections")
]
),
.testTarget(
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -124,11 +124,11 @@ Those contributing to this package are expected to follow the [Swift Code of Con
[Swift API Design Guidelines](https://swift.org/documentation/api-design-guidelines/), and the
[SSWG Technical Best Practices](https://github.com/swift-server/sswg/blob/main/process/incubation.md#technical-best-practices).

This repo uses [SwiftFormat](https://github.com/nicklockwood/SwiftFormat), and includes lint checks to enforce these formatting standards.
To format your code, install `swiftformat` and run:
This repo uses the standard [swift format](https://github.com/swiftlang/swift-format), and includes lint checks to enforce these formatting standards.
To format your code, run:

```bash
swiftformat .
swift format --parallel --in-place --recursive ./
```

Most of this repo mirrors the structure of
Expand Down
Loading
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .swift-format
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
{
"version": 1,
"indentation" : {
"spaces" : 4
},
"lineBreakBeforeEachArgument": true
}
14 changes: 7 additions & 7 deletions Benchmarks/Benchmarks/GraphQLBenchmarks.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,19 +6,19 @@ let benchmarks: @Sendable () -> Void = {
let result = try await graphql(
schema: starWarsSchema,
request: """
query NestedQuery {
hero {
name
friends {
query NestedQuery {
hero {
name
appearsIn
friends {
name
appearsIn
friends {
name
}
}
}
}
}
"""
"""
)
}
}
20 changes: 5 additions & 15 deletions Benchmarks/Benchmarks/StarWarsData.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,16 +126,12 @@ let droidData: [String: Droid] = [
"2001": r2d2,
]

/**
* Helper function to get a character by ID.
*/
/// Helper function to get a character by ID.
@Sendable func getCharacter(id: String) -> Character? {
return humanData[id] ?? droidData[id]
}

/**
* Allows us to query for a character"s friends.
*/
/// Allows us to query for a character"s friends.
@Sendable func getFriends(character: Character) -> [Character] {
return character.friends.reduce(into: []) { friends, friendID in
if let friend = getCharacter(id: friendID) {
Expand All@@ -144,9 +140,7 @@ let droidData: [String: Droid] = [
}
}

/**
* Allows us to fetch the undisputed hero of the Star Wars trilogy, R2-D2.
*/
/// Allows us to fetch the undisputed hero of the Star Wars trilogy, R2-D2.
@Sendable func getHero(episode: Episode?) -> Character {
if episode == .empire {
// Luke is the hero of Episode V.
Expand All@@ -156,16 +150,12 @@ let droidData: [String: Droid] = [
return r2d2
}

/**
* Allows us to query for the human with the given id.
*/
/// Allows us to query for the human with the given id.
@Sendable func getHuman(id: String) -> Human? {
return humanData[id]
}

/**
* Allows us to query for the droid with the given id.
*/
/// Allows us to query for the droid with the given id.
@Sendable func getDroid(id: String) -> Droid? {
return droidData[id]
}
168 changes: 78 additions & 90 deletions Benchmarks/Benchmarks/StarWarsSchema.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,12 +49,10 @@ import GraphQL
* We begin by setting up our schema.
*/

/**
* The original trilogy consists of three movies.
*
* This implements the following type system shorthand:
* enum Episode { NEWHOPE, EMPIRE, JEDI }
*/
/// The original trilogy consists of three movies.
///
/// This implements the following type system shorthand:
/// enum Episode { NEWHOPE, EMPIRE, JEDI }
let EpisodeEnum = try! GraphQLEnumType(
name: "Episode",
description: "One of the films in the Star Wars Trilogy",
Expand All@@ -74,43 +72,43 @@ let EpisodeEnum = try! GraphQLEnumType(
]
)

/**
* Characters in the Star Wars trilogy are either humans or droids.
*
* This implements the following type system shorthand:
* interface Character {
* id: String!
* name: String
* friends: [Character]
* appearsIn: [Episode]
* secretBackstory: String
* }
*/
/// Characters in the Star Wars trilogy are either humans or droids.
///
/// This implements the following type system shorthand:
/// interface Character {
/// id: String!
/// name: String
/// friends: [Character]
/// appearsIn: [Episode]
/// secretBackstory: String
/// }
let CharacterInterface = try! GraphQLInterfaceType(
name: "Character",
description: "A character in the Star Wars Trilogy",
fields: { [
"id": GraphQLField(
type: GraphQLNonNull(GraphQLString),
description: "The id of the character."
),
"name": GraphQLField(
type: GraphQLString,
description: "The name of the character."
),
"friends": GraphQLField(
type: GraphQLList(CharacterInterface),
description: "The friends of the character, or an empty list if they have none."
),
"appearsIn": GraphQLField(
type: GraphQLList(EpisodeEnum),
description: "Which movies they appear in."
),
"secretBackstory": GraphQLField(
type: GraphQLString,
description: "All secrets about their past."
),
] },
fields: {
[
"id": GraphQLField(
type: GraphQLNonNull(GraphQLString),
description: "The id of the character."
),
"name": GraphQLField(
type: GraphQLString,
description: "The name of the character."
),
"friends": GraphQLField(
type: GraphQLList(CharacterInterface),
description: "The friends of the character, or an empty list if they have none."
),
"appearsIn": GraphQLField(
type: GraphQLList(EpisodeEnum),
description: "Which movies they appear in."
),
"secretBackstory": GraphQLField(
type: GraphQLString,
description: "All secrets about their past."
),
]
},
resolveType: { character, _ in
switch character {
case is Human:
Expand All@@ -121,18 +119,16 @@ let CharacterInterface = try! GraphQLInterfaceType(
}
)

/**
* We define our human type, which implements the character interface.
*
* This implements the following type system shorthand:
* type Human : Character {
* id: String!
* name: String
* friends: [Character]
* appearsIn: [Episode]
* secretBackstory: String
* }
*/
/// We define our human type, which implements the character interface.
///
/// This implements the following type system shorthand:
/// type Human : Character {
/// id: String!
/// name: String
/// friends: [Character]
/// appearsIn: [Episode]
/// secretBackstory: String
/// }
let HumanType = try! GraphQLObjectType(
name: "Human",
description: "A humanoid creature in the Star Wars universe.",
Expand All@@ -147,8 +143,7 @@ let HumanType = try! GraphQLObjectType(
),
"friends": GraphQLField(
type: GraphQLList(CharacterInterface),
description: "The friends of the human, or an empty list if they " +
"have none.",
description: "The friends of the human, or an empty list if they " + "have none.",
resolve: { human, _, _, _ in
getFriends(character: human as! Human)
}
Expand DownExpand Up@@ -179,19 +174,17 @@ let HumanType = try! GraphQLObjectType(
}
)

/**
* The other type of character in Star Wars is a droid.
*
* This implements the following type system shorthand:
* type Droid : Character {
* id: String!
* name: String
* friends: [Character]
* appearsIn: [Episode]
* secretBackstory: String
* primaryFunction: String
* }
*/
/// The other type of character in Star Wars is a droid.
///
/// This implements the following type system shorthand:
/// type Droid : Character {
/// id: String!
/// name: String
/// friends: [Character]
/// appearsIn: [Episode]
/// secretBackstory: String
/// primaryFunction: String
/// }
let DroidType = try! GraphQLObjectType(
name: "Droid",
description: "A mechanical creature in the Star Wars universe.",
Expand DownExpand Up@@ -237,20 +230,17 @@ let DroidType = try! GraphQLObjectType(
}
)

/**
* This is the type that will be the root of our query, and the
* entry point into our schema. It gives us the ability to fetch
* objects by their IDs, as well as to fetch the undisputed hero
* of the Star Wars trilogy, R2-D2, directly.
*
* This implements the following type system shorthand:
* type Query {
* hero(episode: Episode): Character
* human(id: String!): Human
* droid(id: String!): Droid
* }
*
*/
/// This is the type that will be the root of our query, and the
/// entry point into our schema. It gives us the ability to fetch
/// objects by their IDs, as well as to fetch the undisputed hero
/// of the Star Wars trilogy, R2-D2, directly.
///
/// This implements the following type system shorthand:
/// type Query {
/// hero(episode: Episode): Character
/// human(id: String!): Human
/// droid(id: String!): Droid
/// }
let QueryType = try! GraphQLObjectType(
name: "Query",
fields: [
Expand All@@ -260,9 +250,9 @@ let QueryType = try! GraphQLObjectType(
"episode": GraphQLArgument(
type: EpisodeEnum,
description:
"If omitted, returns the hero of the whole saga. If " +
"provided, returns the hero of that particular episode."
),
"If omitted, returns the hero of the whole saga. If "
+ "provided, returns the hero of that particular episode."
)
],
resolve: { _, arguments, _, _ in
let episode = Episode(arguments["episode"].string)
Expand All@@ -275,7 +265,7 @@ let QueryType = try! GraphQLObjectType(
"id": GraphQLArgument(
type: GraphQLNonNull(GraphQLString),
description: "id of the human"
),
)
],
resolve: { _, arguments, _, _ in
getHuman(id: arguments["id"].string!)
Expand All@@ -287,7 +277,7 @@ let QueryType = try! GraphQLObjectType(
"id": GraphQLArgument(
type: GraphQLNonNull(GraphQLString),
description: "id of the droid"
),
)
],
resolve: { _, arguments, _, _ in
getDroid(id: arguments["id"].string!)
Expand All@@ -296,10 +286,8 @@ let QueryType = try! GraphQLObjectType(
]
)

/**
* Finally, we construct our schema (whose starting query type is the query
* type we defined above) and export it.
*/
/// Finally, we construct our schema (whose starting query type is the query
/// type we defined above) and export it.
let starWarsSchema = try! GraphQLSchema(
query: QueryType,
types: [HumanType, DroidType]
Expand Down
4 changes: 2 additions & 2 deletions Benchmarks/Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,9 @@ let package = Package(
],
path: "Benchmarks",
plugins: [
.plugin(name: "BenchmarkPlugin", package: "package-benchmark"),
.plugin(name: "BenchmarkPlugin", package: "package-benchmark")
]
),
)
],
swiftLanguageVersions: [.v5, .version("6")]
)
6 changes: 3 additions & 3 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,16 +5,16 @@ let package = Package(
name: "GraphQL",
platforms: [.macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6)],
products: [
.library(name: "GraphQL", targets: ["GraphQL"]),
.library(name: "GraphQL", targets: ["GraphQL"])
],
dependencies: [
.package(url: "https://github.com/apple/swift-collections", .upToNextMajor(from: "1.0.0")),
.package(url: "https://github.com/apple/swift-collections", .upToNextMajor(from: "1.0.0"))
],
targets: [
.target(
name: "GraphQL",
dependencies: [
.product(name: "OrderedCollections", package: "swift-collections"),
.product(name: "OrderedCollections", package: "swift-collections")
]
),
.testTarget(
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -124,11 +124,11 @@ Those contributing to this package are expected to follow the [Swift Code of Con
[Swift API Design Guidelines](https://swift.org/documentation/api-design-guidelines/), and the
[SSWG Technical Best Practices](https://github.com/swift-server/sswg/blob/main/process/incubation.md#technical-best-practices).

This repo uses [SwiftFormat](https://github.com/nicklockwood/SwiftFormat), and includes lint checks to enforce these formatting standards.
To format your code, install `swiftformat` and run:
This repo uses the standard [swift format](https://github.com/swiftlang/swift-format), and includes lint checks to enforce these formatting standards.
To format your code, run:

```bash
swiftformat .
swift format --parallel --in-place --recursive ./
```

Most of this repo mirrors the structure of
Expand Down
Loading
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .swift-format
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
{
"version": 1,
"indentation" : {
"spaces" : 4
},
"lineBreakBeforeEachArgument": true
}
14 changes: 7 additions & 7 deletions Benchmarks/Benchmarks/GraphQLBenchmarks.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,19 +6,19 @@ let benchmarks: @Sendable () -> Void = {
let result = try await graphql(
schema: starWarsSchema,
request: """
query NestedQuery {
hero {
name
friends {
query NestedQuery {
hero {
name
appearsIn
friends {
name
appearsIn
friends {
name
}
}
}
}
}
"""
"""
)
}
}
20 changes: 5 additions & 15 deletions Benchmarks/Benchmarks/StarWarsData.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,16 +126,12 @@ let droidData: [String: Droid] = [
"2001": r2d2,
]

/**
* Helper function to get a character by ID.
*/
/// Helper function to get a character by ID.
@Sendable func getCharacter(id: String) -> Character? {
return humanData[id] ?? droidData[id]
}

/**
* Allows us to query for a character"s friends.
*/
/// Allows us to query for a character"s friends.
@Sendable func getFriends(character: Character) -> [Character] {
return character.friends.reduce(into: []) { friends, friendID in
if let friend = getCharacter(id: friendID) {
Expand All@@ -144,9 +140,7 @@ let droidData: [String: Droid] = [
}
}

/**
* Allows us to fetch the undisputed hero of the Star Wars trilogy, R2-D2.
*/
/// Allows us to fetch the undisputed hero of the Star Wars trilogy, R2-D2.
@Sendable func getHero(episode: Episode?) -> Character {
if episode == .empire {
// Luke is the hero of Episode V.
Expand All@@ -156,16 +150,12 @@ let droidData: [String: Droid] = [
return r2d2
}

/**
* Allows us to query for the human with the given id.
*/
/// Allows us to query for the human with the given id.
@Sendable func getHuman(id: String) -> Human? {
return humanData[id]
}

/**
* Allows us to query for the droid with the given id.
*/
/// Allows us to query for the droid with the given id.
@Sendable func getDroid(id: String) -> Droid? {
return droidData[id]
}
168 changes: 78 additions & 90 deletions Benchmarks/Benchmarks/StarWarsSchema.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,12 +49,10 @@ import GraphQL
* We begin by setting up our schema.
*/

/**
* The original trilogy consists of three movies.
*
* This implements the following type system shorthand:
* enum Episode { NEWHOPE, EMPIRE, JEDI }
*/
/// The original trilogy consists of three movies.
///
/// This implements the following type system shorthand:
/// enum Episode { NEWHOPE, EMPIRE, JEDI }
let EpisodeEnum = try! GraphQLEnumType(
name: "Episode",
description: "One of the films in the Star Wars Trilogy",
Expand All@@ -74,43 +72,43 @@ let EpisodeEnum = try! GraphQLEnumType(
]
)

/**
* Characters in the Star Wars trilogy are either humans or droids.
*
* This implements the following type system shorthand:
* interface Character {
* id: String!
* name: String
* friends: [Character]
* appearsIn: [Episode]
* secretBackstory: String
* }
*/
/// Characters in the Star Wars trilogy are either humans or droids.
///
/// This implements the following type system shorthand:
/// interface Character {
/// id: String!
/// name: String
/// friends: [Character]
/// appearsIn: [Episode]
/// secretBackstory: String
/// }
let CharacterInterface = try! GraphQLInterfaceType(
name: "Character",
description: "A character in the Star Wars Trilogy",
fields: { [
"id": GraphQLField(
type: GraphQLNonNull(GraphQLString),
description: "The id of the character."
),
"name": GraphQLField(
type: GraphQLString,
description: "The name of the character."
),
"friends": GraphQLField(
type: GraphQLList(CharacterInterface),
description: "The friends of the character, or an empty list if they have none."
),
"appearsIn": GraphQLField(
type: GraphQLList(EpisodeEnum),
description: "Which movies they appear in."
),
"secretBackstory": GraphQLField(
type: GraphQLString,
description: "All secrets about their past."
),
] },
fields: {
[
"id": GraphQLField(
type: GraphQLNonNull(GraphQLString),
description: "The id of the character."
),
"name": GraphQLField(
type: GraphQLString,
description: "The name of the character."
),
"friends": GraphQLField(
type: GraphQLList(CharacterInterface),
description: "The friends of the character, or an empty list if they have none."
),
"appearsIn": GraphQLField(
type: GraphQLList(EpisodeEnum),
description: "Which movies they appear in."
),
"secretBackstory": GraphQLField(
type: GraphQLString,
description: "All secrets about their past."
),
]
},
resolveType: { character, _ in
switch character {
case is Human:
Expand All@@ -121,18 +119,16 @@ let CharacterInterface = try! GraphQLInterfaceType(
}
)

/**
* We define our human type, which implements the character interface.
*
* This implements the following type system shorthand:
* type Human : Character {
* id: String!
* name: String
* friends: [Character]
* appearsIn: [Episode]
* secretBackstory: String
* }
*/
/// We define our human type, which implements the character interface.
///
/// This implements the following type system shorthand:
/// type Human : Character {
/// id: String!
/// name: String
/// friends: [Character]
/// appearsIn: [Episode]
/// secretBackstory: String
/// }
let HumanType = try! GraphQLObjectType(
name: "Human",
description: "A humanoid creature in the Star Wars universe.",
Expand All@@ -147,8 +143,7 @@ let HumanType = try! GraphQLObjectType(
),
"friends": GraphQLField(
type: GraphQLList(CharacterInterface),
description: "The friends of the human, or an empty list if they " +
"have none.",
description: "The friends of the human, or an empty list if they " + "have none.",
resolve: { human, _, _, _ in
getFriends(character: human as! Human)
}
Expand DownExpand Up@@ -179,19 +174,17 @@ let HumanType = try! GraphQLObjectType(
}
)

/**
* The other type of character in Star Wars is a droid.
*
* This implements the following type system shorthand:
* type Droid : Character {
* id: String!
* name: String
* friends: [Character]
* appearsIn: [Episode]
* secretBackstory: String
* primaryFunction: String
* }
*/
/// The other type of character in Star Wars is a droid.
///
/// This implements the following type system shorthand:
/// type Droid : Character {
/// id: String!
/// name: String
/// friends: [Character]
/// appearsIn: [Episode]
/// secretBackstory: String
/// primaryFunction: String
/// }
let DroidType = try! GraphQLObjectType(
name: "Droid",
description: "A mechanical creature in the Star Wars universe.",
Expand DownExpand Up@@ -237,20 +230,17 @@ let DroidType = try! GraphQLObjectType(
}
)

/**
* This is the type that will be the root of our query, and the
* entry point into our schema. It gives us the ability to fetch
* objects by their IDs, as well as to fetch the undisputed hero
* of the Star Wars trilogy, R2-D2, directly.
*
* This implements the following type system shorthand:
* type Query {
* hero(episode: Episode): Character
* human(id: String!): Human
* droid(id: String!): Droid
* }
*
*/
/// This is the type that will be the root of our query, and the
/// entry point into our schema. It gives us the ability to fetch
/// objects by their IDs, as well as to fetch the undisputed hero
/// of the Star Wars trilogy, R2-D2, directly.
///
/// This implements the following type system shorthand:
/// type Query {
/// hero(episode: Episode): Character
/// human(id: String!): Human
/// droid(id: String!): Droid
/// }
let QueryType = try! GraphQLObjectType(
name: "Query",
fields: [
Expand All@@ -260,9 +250,9 @@ let QueryType = try! GraphQLObjectType(
"episode": GraphQLArgument(
type: EpisodeEnum,
description:
"If omitted, returns the hero of the whole saga. If " +
"provided, returns the hero of that particular episode."
),
"If omitted, returns the hero of the whole saga. If "
+ "provided, returns the hero of that particular episode."
)
],
resolve: { _, arguments, _, _ in
let episode = Episode(arguments["episode"].string)
Expand All@@ -275,7 +265,7 @@ let QueryType = try! GraphQLObjectType(
"id": GraphQLArgument(
type: GraphQLNonNull(GraphQLString),
description: "id of the human"
),
)
],
resolve: { _, arguments, _, _ in
getHuman(id: arguments["id"].string!)
Expand All@@ -287,7 +277,7 @@ let QueryType = try! GraphQLObjectType(
"id": GraphQLArgument(
type: GraphQLNonNull(GraphQLString),
description: "id of the droid"
),
)
],
resolve: { _, arguments, _, _ in
getDroid(id: arguments["id"].string!)
Expand All@@ -296,10 +286,8 @@ let QueryType = try! GraphQLObjectType(
]
)

/**
* Finally, we construct our schema (whose starting query type is the query
* type we defined above) and export it.
*/
/// Finally, we construct our schema (whose starting query type is the query
/// type we defined above) and export it.
let starWarsSchema = try! GraphQLSchema(
query: QueryType,
types: [HumanType, DroidType]
Expand Down
4 changes: 2 additions & 2 deletions Benchmarks/Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,9 +20,9 @@ let package = Package(
],
path: "Benchmarks",
plugins: [
.plugin(name: "BenchmarkPlugin", package: "package-benchmark"),
.plugin(name: "BenchmarkPlugin", package: "package-benchmark")
]
),
)
],
swiftLanguageVersions: [.v5, .version("6")]
)
6 changes: 3 additions & 3 deletions Package.swift
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,16 +5,16 @@ let package = Package(
name: "GraphQL",
platforms: [.macOS(.v10_15), .iOS(.v13), .tvOS(.v13), .watchOS(.v6)],
products: [
.library(name: "GraphQL", targets: ["GraphQL"]),
.library(name: "GraphQL", targets: ["GraphQL"])
],
dependencies: [
.package(url: "https://github.com/apple/swift-collections", .upToNextMajor(from: "1.0.0")),
.package(url: "https://github.com/apple/swift-collections", .upToNextMajor(from: "1.0.0"))
],
targets: [
.target(
name: "GraphQL",
dependencies: [
.product(name: "OrderedCollections", package: "swift-collections"),
.product(name: "OrderedCollections", package: "swift-collections")
]
),
.testTarget(
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -124,11 +124,11 @@ Those contributing to this package are expected to follow the [Swift Code of Con
[Swift API Design Guidelines](https://swift.org/documentation/api-design-guidelines/), and the
[SSWG Technical Best Practices](https://github.com/swift-server/sswg/blob/main/process/incubation.md#technical-best-practices).

This repo uses [SwiftFormat](https://github.com/nicklockwood/SwiftFormat), and includes lint checks to enforce these formatting standards.
To format your code, install `swiftformat` and run:
This repo uses the standard [swift format](https://github.com/swiftlang/swift-format), and includes lint checks to enforce these formatting standards.
To format your code, run:

```bash
swiftformat .
swift format --parallel --in-place --recursive ./
```

Most of this repo mirrors the structure of
Expand Down
Loading
Loading