Skip to content

Commit bee0675

Browse files
author
Jay Herron
committed
Moves all RxSwift dependency to GraphQLRxSwift
1 parent e4beac6 commit bee0675

File tree

4 files changed

+2
-1100
lines changed

4 files changed

+2
-1100
lines changed

Package.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,14 @@ let package = Package(
88
],
99
dependencies: [
1010
.package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.10.1")),
11-
.package(url: "https://github.com/wickwirew/Runtime.git", .upToNextMinor(from: "2.1.0")),
12-
.package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "6.1.0"))
11+
.package(url: "https://github.com/wickwirew/Runtime.git", .upToNextMinor(from: "2.1.0"))
1312
],
1413
targets: [
1514
.target(
1615
name: "GraphQL",
1716
dependencies: [
1817
.product(name: "NIO", package: "swift-nio"),
19-
.product(name: "Runtime", package: "Runtime"),
20-
.product(name: "RxSwift", package: "RxSwift")
18+
.product(name: "Runtime", package: "Runtime")
2119
]
2220
),
2321
.testTarget(name: "GraphQLTests", dependencies: ["GraphQL"]),
Lines changed: 0 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
// Copyright (c) 2021 PassiveLogic, Inc.
2-
3-
import RxSwift
4-
51
/// Abstract event stream class - Should be overridden for actual implementations
62
open class EventStream<Element> {
73
public init() { }
@@ -10,74 +6,3 @@ open class EventStream<Element> {
106
fatalError("This function should be overridden by implementing classes")
117
}
128
}
13-
14-
15-
// TODO: Put in separate GraphQLRxSwift package
16-
17-
// EventStream wrapper for Observable
18-
public class ObservableEventStream<Element> : EventStream<Element> {
19-
public var observable: Observable<Element>
20-
init(_ observable: Observable<Element>) {
21-
self.observable = observable
22-
}
23-
override open func map<To>(_ closure: @escaping (Element) throws -> To) -> EventStream<To> {
24-
return ObservableEventStream<To>(observable.map(closure))
25-
}
26-
}
27-
// Convenience types
28-
public typealias ObservableSourceEventStream = ObservableEventStream<Future<Any>>
29-
public typealias ObservableSubscriptionEventStream = ObservableEventStream<Future<GraphQLResult>>
30-
31-
extension Observable {
32-
// Convenience method for wrapping Observables in EventStreams
33-
public func toEventStream() -> ObservableEventStream<Element> {
34-
return ObservableEventStream(self)
35-
}
36-
}
37-
38-
39-
// TODO: Delete notes below
40-
41-
// Protocol attempts
42-
43-
//protocol EventStreamP {
44-
// associatedtype Element
45-
// func transform<To>(_ closure: @escaping (Element) throws -> To) -> EventStreamP // How to specify that returned associated type is 'To'
46-
//}
47-
//extension Observable: EventStreamP {
48-
// func transform<To>(_ closure: @escaping (Element) throws -> To) -> EventStreamP {
49-
// return self.map(closure)
50-
// }
51-
//}
52-
53-
// Try defining element in closure return
54-
//protocol EventStreamP {
55-
// associatedtype Element
56-
// func transform<ResultStream: EventStreamP>(_ closure: @escaping (Element) throws -> ResultStream.Element) -> ResultStream
57-
//}
58-
//extension Observable: EventStreamP {
59-
// func transform<ResultStream: EventStreamP>(_ closure: @escaping (Element) throws -> ResultStream.Element) -> ResultStream {
60-
// return self.map(closure) // Observable<ResultStream.Element> isn't recognized as a ResultStream
61-
// }
62-
//}
63-
64-
// Try absorbing generic type into function
65-
//protocol EventStreamP {
66-
// func transform<From, To>(_ closure: @escaping (From) throws -> To) -> EventStreamP
67-
//}
68-
//extension Observable: EventStreamP {
69-
// func transform<From, To>(_ closure: @escaping (From) throws -> To) -> EventStreamP {
70-
// return self.map(closure) // Doesn't recognize that Observable.Element is the same as From
71-
// }
72-
//}
73-
74-
// Try opaque types
75-
//protocol EventStreamP {
76-
// associatedtype Element
77-
// func transform<To>(_ closure: @escaping (Element) throws -> To) -> some EventStreamP
78-
//}
79-
//extension Observable: EventStreamP {
80-
// func transform<To>(_ closure: @escaping (Element) throws -> To) -> some EventStreamP {
81-
// return self.map(closure)
82-
// }
83-
//}

Tests/GraphQLTests/Subscription/SubscriptionSchema.swift

Lines changed: 0 additions & 200 deletions
This file was deleted.

0 commit comments

Comments
 (0)