Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Update JS CLI to 2.30.1, remove now-unnecessary workaround #1316

Merged
merged 4 commits into from
Jul 16, 2020
+61 −62
Merged

Update JS CLI to 2.30.1, remove now-unnecessary workaround #1316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb54eda
update to v2.30.1 of JS CLI
designatednerd Jul 16, 2020
60401f2
updated files after re-running updated CLI
designatednerd Jul 16, 2020
40a21d1
remove workaround to get the correct operation identifier since it's …
designatednerd Jul 16, 2020
604479c
fix some files that got moved around under the hood in the Github API
designatednerd Jul 16, 2020
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
32 changes: 20 additions & 12 deletions Apollo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,14 +550,14 @@
9BDE43D022C6655200FD7C7F /* Cancellable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Cancellable.swift; sourceTree = "<group>"; };
9BDE43DC22C6705300FD7C7F /* GraphQLHTTPResponseError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GraphQLHTTPResponseError.swift; sourceTree = "<group>"; };
9BDE43DE22C6708600FD7C7F /* GraphQLHTTPRequestError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GraphQLHTTPRequestError.swift; sourceTree = "<group>"; };
9BDF200B23FDC37600153E2B /* RepoURL.graphql */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RepoURL.graphql; sourceTree = "<group>"; };
9BDF200C23FDC37600153E2B /* GitHubAPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GitHubAPI.h; sourceTree = "<group>"; };
9BDF200D23FDC37600153E2B /* operationIdsPath.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = operationIdsPath.json; sourceTree = "<group>"; };
9BDF200E23FDC37600153E2B /* operationIDs.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = operationIDs.json; sourceTree = "<group>"; };
9BDF200F23FDC37600153E2B /* schema.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = schema.json; sourceTree = "<group>"; };
9BDF201023FDC37600153E2B /* Repository.graphql */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Repository.graphql; sourceTree = "<group>"; };
9BDF201123FDC37600153E2B /* API.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = API.swift; sourceTree = "<group>"; };
9BDF201223FDC37600153E2B /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
9BDF2EC824C100B600AC9A1E /* schema.docs.graphql */ = {isa = PBXFileReference; lastKnownFileType = text; path = schema.docs.graphql; sourceTree = "<group>"; };
9BDF2ED124C100DF00AC9A1E /* RepoURL.graphql */ = {isa = PBXFileReference; lastKnownFileType = text; path = RepoURL.graphql; sourceTree = "<group>"; };
9BDF2ED224C100DF00AC9A1E /* Repository.graphql */ = {isa = PBXFileReference; lastKnownFileType = text; path = Repository.graphql; sourceTree = "<group>"; };
9BE071AC2368D08700FA5952 /* Collection+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Collection+Helpers.swift"; sourceTree = "<group>"; };
9BE071AE2368D34D00FA5952 /* Matchable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Matchable.swift; sourceTree = "<group>"; };
9BE071B02368D3F500FA5952 /* Dictionary+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Dictionary+Helpers.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1114,39 +1114,47 @@
9BDF200723FDC37600153E2B /* GitHubAPI */ = {
isa = PBXGroup;
children = (
9BDF200823FDC37600153E2B /* TestFolder */,
9BDF200C23FDC37600153E2B /* GitHubAPI.h */,
9BDF2ECD24C100DF00AC9A1E /* Queries */,
9BDF200D23FDC37600153E2B /* operationIdsPath.json */,
9BDF200E23FDC37600153E2B /* operationIDs.json */,
9BDF200F23FDC37600153E2B /* schema.json */,
9BDF201023FDC37600153E2B /* Repository.graphql */,
9BDF2EC824C100B600AC9A1E /* schema.docs.graphql */,
9BDF201123FDC37600153E2B /* API.swift */,
9BDF201223FDC37600153E2B /* Info.plist */,
);
name = GitHubAPI;
path = Sources/GitHubAPI;
sourceTree = SOURCE_ROOT;
};
9BDF200823FDC37600153E2B /* TestFolder */ = {
9BDF2ECD24C100DF00AC9A1E /* Queries */ = {
isa = PBXGroup;
children = (
9BDF200923FDC37600153E2B /* TestFolder2 */,
9BDF2ECE24C100DF00AC9A1E /* TestFolder */,
9BDF2ED224C100DF00AC9A1E /* Repository.graphql */,
);
path = Queries;
sourceTree = "<group>";
};
9BDF2ECE24C100DF00AC9A1E /* TestFolder */ = {
isa = PBXGroup;
children = (
9BDF2ECF24C100DF00AC9A1E /* TestFolder2 */,
);
path = TestFolder;
sourceTree = "<group>";
};
9BDF200923FDC37600153E2B /* TestFolder2 */ = {
9BDF2ECF24C100DF00AC9A1E /* TestFolder2 */ = {
isa = PBXGroup;
children = (
9BDF200A23FDC37600153E2B /* TestFolder3 */,
9BDF2ED024C100DF00AC9A1E /* TestFolder3 */,
);
path = TestFolder2;
sourceTree = "<group>";
};
9BDF200A23FDC37600153E2B /* TestFolder3 */ = {
9BDF2ED024C100DF00AC9A1E /* TestFolder3 */ = {
isa = PBXGroup;
children = (
9BDF200B23FDC37600153E2B /* RepoURL.graphql */,
9BDF2ED124C100DF00AC9A1E /* RepoURL.graphql */,
);
path = TestFolder3;
sourceTree = "<group>";
Expand Down
11 changes: 1 addition & 10 deletions Sources/Apollo/RequestCreator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,8 @@ extension RequestCreator {
preconditionFailure("To enable `autoPersistQueries`, Apollo types must be generated with operationIdentifiers")
}

let hash: String
if operation.operationDefinition == operation.queryDocument {
// The codegen had everything it needed to generate the hash
hash = operationIdentifier
} else {
// The codegen needed more info for the correct hash - regenerate it.
hash = operation.queryDocument.apollo.sha256Hash
}

body["extensions"] = [
"persistedQuery" : ["sha256Hash": hash, "version": 1]
"persistedQuery" : ["sha256Hash": operationIdentifier, "version": 1]
]
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/ApolloCodegenLib/CLIDownloader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ struct CLIDownloader {
}

/// The URL string for getting the current version of the CLI
static let downloadURLString = "https://install.apollographql.com/legacy-cli/darwin/2.28.3"
static let downloadURLString = "https://install.apollographql.com/legacy-cli/darwin/2.30.1"

/// Downloads the appropriate Apollo CLI in a zip file.
///
Expand Down
2 changes: 1 addition & 1 deletion Sources/ApolloCodegenLib/CLIExtractor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ struct CLIExtractor {
}
}

static let expectedSHASUM = "cb2f4b9f53eb8443661e7658e407a3837da3d781649f8bc66a1c6cf7d32acef1"
static let expectedSHASUM = "c2b1215eb8e82ec9d777f4b1590ed0f60960a23badadd889e4d129eb08866f14"

/// Checks to see if the CLI has already been extracted and is the correct version, and extracts or re-extracts as necessary
///
Expand Down
36 changes: 18 additions & 18 deletions Sources/GitHubAPI/API.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public final class RepositoryQuery: GraphQLQuery {
}

public struct Author: GraphQLSelectionSet {
public static let possibleTypes: [String] = ["EnterpriseUserAccount", "Organization", "User", "Bot", "Mannequin"]
public static let possibleTypes: [String] = ["Bot", "EnterpriseUserAccount", "Mannequin", "Organization", "User"]

public static var selections: [GraphQLSelection] {
return [
Expand All @@ -159,10 +159,18 @@ public final class RepositoryQuery: GraphQLQuery {
self.resultMap = unsafeResultMap
}

public static func makeBot(login: String) -> Author {
return Author(unsafeResultMap: ["__typename": "Bot", "login": login])
}

public static func makeEnterpriseUserAccount(login: String) -> Author {
return Author(unsafeResultMap: ["__typename": "EnterpriseUserAccount", "login": login])
}

public static func makeMannequin(login: String) -> Author {
return Author(unsafeResultMap: ["__typename": "Mannequin", "login": login])
}

public static func makeOrganization(login: String) -> Author {
return Author(unsafeResultMap: ["__typename": "Organization", "login": login])
}
Expand All @@ -171,14 +179,6 @@ public final class RepositoryQuery: GraphQLQuery {
return Author(unsafeResultMap: ["__typename": "User", "login": login])
}

public static func makeBot(login: String) -> Author {
return Author(unsafeResultMap: ["__typename": "Bot", "login": login])
}

public static func makeMannequin(login: String) -> Author {
return Author(unsafeResultMap: ["__typename": "Mannequin", "login": login])
}

public var __typename: String {
get {
return resultMap["__typename"]! as! String
Expand Down Expand Up @@ -284,7 +284,7 @@ public final class RepositoryQuery: GraphQLQuery {
}

public struct Author: GraphQLSelectionSet {
public static let possibleTypes: [String] = ["EnterpriseUserAccount", "Organization", "User", "Bot", "Mannequin"]
public static let possibleTypes: [String] = ["Bot", "EnterpriseUserAccount", "Mannequin", "Organization", "User"]

public static var selections: [GraphQLSelection] {
return [
Expand All @@ -301,10 +301,18 @@ public final class RepositoryQuery: GraphQLQuery {
self.resultMap = unsafeResultMap
}

public static func makeBot(avatarUrl: String, login: String) -> Author {
return Author(unsafeResultMap: ["__typename": "Bot", "avatarUrl": avatarUrl, "login": login])
}

public static func makeEnterpriseUserAccount(avatarUrl: String, login: String) -> Author {
return Author(unsafeResultMap: ["__typename": "EnterpriseUserAccount", "avatarUrl": avatarUrl, "login": login])
}

public static func makeMannequin(avatarUrl: String, login: String) -> Author {
return Author(unsafeResultMap: ["__typename": "Mannequin", "avatarUrl": avatarUrl, "login": login])
}

public static func makeOrganization(avatarUrl: String, login: String) -> Author {
return Author(unsafeResultMap: ["__typename": "Organization", "avatarUrl": avatarUrl, "login": login])
}
Expand All @@ -313,14 +321,6 @@ public final class RepositoryQuery: GraphQLQuery {
return Author(unsafeResultMap: ["__typename": "User", "avatarUrl": avatarUrl, "login": login])
}

public static func makeBot(avatarUrl: String, login: String) -> Author {
return Author(unsafeResultMap: ["__typename": "Bot", "avatarUrl": avatarUrl, "login": login])
}

public static func makeMannequin(avatarUrl: String, login: String) -> Author {
return Author(unsafeResultMap: ["__typename": "Mannequin", "avatarUrl": avatarUrl, "login": login])
}

public var __typename: String {
get {
return resultMap["__typename"]! as! String
Expand Down
18 changes: 9 additions & 9 deletions Sources/StarWarsAPI/API.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,7 +1048,7 @@ public final class HeroAndFriendsNamesWithFragmentQuery: GraphQLQuery {

public let operationIdentifier: String? = "1d3ad903dad146ff9d7aa09813fc01becd017489bfc1af8ffd178498730a5a26"

public var queryDocument: String { return operationDefinition.appending(FriendsNames.fragmentDefinition) }
public var queryDocument: String { return operationDefinition.appending("\n" + FriendsNames.fragmentDefinition) }

public var episode: Episode?

Expand Down Expand Up @@ -1241,7 +1241,7 @@ public final class HeroAndFriendsNamesWithFragmentTwiceQuery: GraphQLQuery {

public let operationIdentifier: String? = "e02ef22e116ad1ca35f0298ed3badb60eeb986203f0088575a5f137768c322fc"

public var queryDocument: String { return operationDefinition.appending(CharacterName.fragmentDefinition) }
public var queryDocument: String { return operationDefinition.appending("\n" + CharacterName.fragmentDefinition) }

public var episode: Episode?

Expand Down Expand Up @@ -1636,7 +1636,7 @@ public final class HeroAppearsInWithFragmentQuery: GraphQLQuery {

public let operationIdentifier: String? = "1756158bd7736d58db45a48d74a724fa1b6fdac735376df8afac8318ba5431fb"

public var queryDocument: String { return operationDefinition.appending(CharacterAppearsIn.fragmentDefinition) }
public var queryDocument: String { return operationDefinition.appending("\n" + CharacterAppearsIn.fragmentDefinition) }

public var episode: Episode?

Expand Down Expand Up @@ -2299,7 +2299,7 @@ public final class HeroDetailsFragmentConditionalInclusionQuery: GraphQLQuery {

public let operationIdentifier: String? = "b31aec7d977249e185922e4cc90318fd2c7197631470904bf937b0626de54b4f"

public var queryDocument: String { return operationDefinition.appending(HeroDetails.fragmentDefinition) }
public var queryDocument: String { return operationDefinition.appending("\n" + HeroDetails.fragmentDefinition) }

public var includeDetails: Bool

Expand Down Expand Up @@ -3485,7 +3485,7 @@ public final class HeroDetailsWithFragmentQuery: GraphQLQuery {

public let operationIdentifier: String? = "d20fa2f460058b8eec3d227f2f6088a708cf35dfa2b5ebf1414e34f9674ecfce"

public var queryDocument: String { return operationDefinition.appending(HeroDetails.fragmentDefinition) }
public var queryDocument: String { return operationDefinition.appending("\n" + HeroDetails.fragmentDefinition) }

public var episode: Episode?

Expand Down Expand Up @@ -3801,7 +3801,7 @@ public final class DroidDetailsWithFragmentQuery: GraphQLQuery {

public let operationIdentifier: String? = "7277e97563e911ac8f5c91d401028d218aae41f38df014d7fa0b037bb2a2e739"

public var queryDocument: String { return operationDefinition.appending(DroidDetails.fragmentDefinition) }
public var queryDocument: String { return operationDefinition.appending("\n" + DroidDetails.fragmentDefinition) }

public var episode: Episode?

Expand Down Expand Up @@ -4432,7 +4432,7 @@ public final class HeroNameWithFragmentQuery: GraphQLQuery {

public let operationIdentifier: String? = "b952f0054915a32ec524ac0dde0244bcda246649debe149f9e32e303e21c8266"

public var queryDocument: String { return operationDefinition.appending(CharacterName.fragmentDefinition) }
public var queryDocument: String { return operationDefinition.appending("\n" + CharacterName.fragmentDefinition) }

public var episode: Episode?

Expand Down Expand Up @@ -4562,7 +4562,7 @@ public final class HeroNameWithFragmentAndIdQuery: GraphQLQuery {

public let operationIdentifier: String? = "a87a0694c09d1ed245e9a80f245d96a5f57b20a4aa936ee9ab09b2a43620db02"

public var queryDocument: String { return operationDefinition.appending(CharacterName.fragmentDefinition) }
public var queryDocument: String { return operationDefinition.appending("\n" + CharacterName.fragmentDefinition) }

public var episode: Episode?

Expand Down Expand Up @@ -4702,7 +4702,7 @@ public final class HeroNameAndAppearsInWithFragmentQuery: GraphQLQuery {

public let operationIdentifier: String? = "0664fed3eb4f9fbdb44e8691d9e8fd11f2b3c097ba11327592054f602bd3ba1a"

public var queryDocument: String { return operationDefinition.appending(CharacterNameAndAppearsIn.fragmentDefinition) }
public var queryDocument: String { return operationDefinition.appending("\n" + CharacterNameAndAppearsIn.fragmentDefinition) }

public var episode: Episode?

Expand Down
Loading