Revert "[Firestore] Consolidate Firestore and FirestoreSwift (#11806)" #11939
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit a7e3720.
paulb777
approved these changes
Oct 13, 2023
Apple API Diff ReportCommit: 0ca069d FirebaseFirestoreSwift[ADDED] ExtensionsSwift:
+ public extension CollectionReference
+ @discardableResult func addDocument ( data : [ String : Any ]) async throws -> DocumentReference
+ @discardableResult func addDocument < T : Encodable > ( from value : T , encoder : Firestore . Encoder = Firestore . Encoder (), completion : (( Error ?) -> Void )? = nil ) throws -> DocumentReference
+ extension Date : ServerTimestampWrappable
+ public static func wrap ( _ timestamp : Timestamp ) throws -> Date
+ public static func unwrap ( _ value : ` Self ` ) throws -> Timestamp
+ extension DocumentReference : DocumentIDWrappable
+ public static func wrap ( _ documentReference : DocumentReference ) throws -> Self
+ func getDocument < T : Decodable > ( as type : T . Type , with serverTimestampBehavior : ServerTimestampBehavior = . none , decoder : Firestore . Decoder = . init (), completion : @escaping ( Result < T , Error > ) -> Void )
+ @available(iOS 13, tvOS 13, macOS 10.15, watchOS 7, *) func getDocument < T : Decodable > ( as type : T . Type , with serverTimestampBehavior : ServerTimestampBehavior = . none , decoder : Firestore . Decoder = . init ()) async throws -> T
+ func setData < T : Encodable > ( from value : T , encoder : Firestore . Encoder = Firestore . Encoder (), completion : (( Error ?) -> Void )? = nil ) throws
+ func setData < T : Encodable > ( from value : T , merge : Bool , encoder : Firestore . Encoder = Firestore . Encoder (), completion : (( Error ?) -> Void )? = nil ) throws
+ func setData < T : Encodable > ( from value : T , mergeFields : [ Any ], encoder : Firestore . Encoder = Firestore . Encoder (), completion : (( Error ?) -> Void )? = nil ) throws
+ public extension DocumentSnapshot
+ func data < T : Decodable > ( as type : T . Type , with serverTimestampBehavior : ServerTimestampBehavior = . none , decoder : Firestore . Decoder = . init ()) throws -> T
+ extension FieldValue : Encodable
+ public func encode ( to encoder : Encoder ) throws
+ public extension FirebaseDataDecoder . DateDecodingStrategy
+ static var timestamp : FirebaseDataDecoder . DateDecodingStrategy { get }
+ public extension FirebaseDataEncoder . DateEncodingStrategy
+ static var timestamp : FirebaseDataEncoder . DateEncodingStrategy { get }
+ public extension Firestore
+ func loadBundle ( _ bundleStream : InputStream ) async throws -> LoadBundleTaskProgress
+ func runTransaction ( _ updateBlock : @escaping ( Transaction , NSErrorPointer ) -> Any ?) async throws -> Any ?
+ class Encoder
+ class Decoder
+ public var dateEncodingStrategy : FirebaseDataEncoder . DateEncodingStrategy
+ public var dataEncodingStrategy : FirebaseDataEncoder . DataEncodingStrategy
+ public var nonConformingFloatEncodingStrategy : FirebaseDataEncoder . NonConformingFloatEncodingStrategy
+ public var keyEncodingStrategy : FirebaseDataEncoder . KeyEncodingStrategy
+ public var userInfo : [ CodingUserInfoKey : Any ]
+ public func encode < T > ( _ value : T ) throws -> [ String : Any ] where T : Encodable
+ public init ()
+ public var dateDecodingStrategy : FirebaseDataDecoder . DateDecodingStrategy
+ public var dataDecodingStrategy : FirebaseDataDecoder . DataDecodingStrategy
+ public var nonConformingFloatDecodingStrategy : FirebaseDataDecoder . NonConformingFloatDecodingStrategy
+ public var keyDecodingStrategy : FirebaseDataDecoder . KeyDecodingStrategy
+ public var userInfo : [ CodingUserInfoKey : Any ]
+ public func decode < T > ( _ t : T . Type , from data : Any ) throws -> T where T : Decodable
+ public func decode < T : Decodable > ( _ t : T . Type , from data : Any , in reference : DocumentReference ?) throws -> T
+ public init ()
+ extension String : DocumentIDWrappable
+ public static func wrap ( _ documentReference : DocumentReference ) throws -> String
+ extension Timestamp : ServerTimestampWrappable
+ public static func wrap ( _ timestamp : Timestamp ) throws -> Self
+ public static func unwrap ( _ value : Timestamp ) throws -> Timestamp
+ public extension Transaction
+ @discardableResult func setData < T : Encodable > ( from value : T , forDocument doc : DocumentReference , encoder : Firestore . Encoder = Firestore . Encoder ()) throws -> Transaction
+ @discardableResult func setData < T : Encodable > ( from value : T , forDocument doc : DocumentReference , merge : Bool , encoder : Firestore . Encoder = Firestore . Encoder ()) throws -> Transaction
+ @discardableResult func setData < T : Encodable > ( from value : T , forDocument doc : DocumentReference , mergeFields : [ Any ], encoder : Firestore . Encoder = Firestore . Encoder ()) throws -> Transaction
+ public extension WriteBatch
+ @discardableResult func setData < T : Encodable > ( from value : T , forDocument doc : DocumentReference , encoder : Firestore . Encoder = Firestore . Encoder ()) throws -> WriteBatch
+ @discardableResult func setData < T : Encodable > ( from value : T , forDocument doc : DocumentReference , merge : Bool , encoder : Firestore . Encoder = Firestore . Encoder ()) throws -> WriteBatch
+ @discardableResult func setData < T : Encodable > ( from value : T , forDocument doc : DocumentReference , mergeFields : [ Any ], encoder : Firestore . Encoder = Firestore . Encoder ()) throws -> WriteBatch[ADDED] EnumerationsSwift:
+ public enum DecodingFailureStrategy
+ case ignore
+ case raise
+ public enum FirestoreDecodingError : Error
+ case decodingIsNotSupported ( String )
+ case fieldNameConflict ( String )
+ public enum FirestoreEncodingError : Error
+ case encodingIsNotSupported ( String )
+ public enum QueryPredicate
+ case isEqualTo ( _ : String , _ : Any )
+ case isIn ( _ : String , _ : [ Any ])
+ case isNotIn ( _ : String , _ : [ Any ])
+ case arrayContains ( _ : String , _ : Any )
+ case arrayContainsAny ( _ : String , _ : [ Any ])
+ case isLessThan ( _ : String , _ : Any )
+ case isGreaterThan ( _ : String , _ : Any )
+ case isLessThanOrEqualTo ( _ : String , _ : Any )
+ case isGreaterThanOrEqualTo ( _ : String , _ : Any )
+ case orderBy ( _ : String , _ : Bool )
+ case limitTo ( _ : Int )
+ case limitToLast ( _ : Int )
+ public static func whereField ( _ field : String , isEqualTo value : Any ) -> QueryPredicate
+ public static func whereField ( _ field : String , isIn values : [ Any ]) -> QueryPredicate
+ public static func whereField ( _ field : String , isNotIn values : [ Any ]) -> QueryPredicate
+ public static func whereField ( _ field : String , arrayContains value : Any ) -> QueryPredicate
+ public static func whereField ( _ field : String , arrayContainsAny values : [ Any ]) -> QueryPredicate
+ public static func whereField ( _ field : String , isLessThan value : Any ) -> QueryPredicate
+ public static func whereField ( _ field : String , isGreaterThan value : Any ) -> QueryPredicate
+ public static func whereField ( _ field : String , isLessThanOrEqualTo value : Any ) -> QueryPredicate
+ public static func whereField ( _ field : String , isGreaterThanOrEqualTo value : Any ) -> QueryPredicate
+ public static func order ( by field : String , descending value : Bool = false ) -> QueryPredicate
+ public static func limit ( to value : Int ) -> QueryPredicate
+ public static func limit ( toLast value : Int ) -> QueryPredicate
+ public static func ` where ` ( _ name : String , isEqualTo value : Any ) -> QueryPredicate
+ public static func ` where ` ( _ name : String , isIn values : [ Any ]) -> QueryPredicate
+ public static func ` where ` ( _ name : String , isNotIn values : [ Any ]) -> QueryPredicate
+ public static func ` where ` ( field name : String , arrayContains value : Any ) -> QueryPredicate
+ public static func ` where ` ( _ name : String , arrayContainsAny values : [ Any ]) -> QueryPredicate
+ public static func ` where ` ( _ name : String , isLessThan value : Any ) -> QueryPredicate
+ public static func ` where ` ( _ name : String , isGreaterThan value : Any ) -> QueryPredicate
+ public static func ` where ` ( _ name : String , isLessThanOrEqualTo value : Any ) -> QueryPredicate
+ public static func ` where ` ( _ name : String , isGreaterThanOrEqualTo value : Any ) -> QueryPredicate[ADDED] StructuresSwift:
+ @propertyWrapper public struct DocumentID < Value : DocumentIDWrappable & Codable > : StructureCodingUncodedUnkeyed extension DocumentID : Codable extension DocumentID : Equatable where Value : Equatable extension DocumentID : Hashable where Value : Hashable
+ public init ( wrappedValue value : Value ?)
+ public var wrappedValue : Value ? { get set }
+ public init ( from decoder : Decoder ) throws
+ public func encode ( to encoder : Encoder ) throws
+ @propertyWrapper public struct ExplicitNull < Value > extension ExplicitNull : Equatable where Value : Equatable extension ExplicitNull : Hashable where Value : Hashable extension ExplicitNull : Encodable where Value : Encodable extension ExplicitNull : Decodable where Value : Decodable
+ public init ( wrappedValue value : Value ?)
+ public var wrappedValue : Value ? { get set }
+ public func encode ( to encoder : Encoder ) throws
+ public init ( from decoder : Decoder ) throws
+ @available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *) @propertyWrapper public struct FirestoreQuery < T > : DynamicProperty
+ public struct Configuration
+ public var wrappedValue : T { get }
+ public var projectedValue : Configuration { get nonmutating set }
+ public init < U : Decodable > ( collectionPath : String , predicates : [ QueryPredicate ] = [], decodingFailureStrategy : DecodingFailureStrategy = . raise , animation : Animation ? = nil ) where T == Result < [ U ], Error >
+ public var path : String
+ public var predicates : [ QueryPredicate ]
+ public var decodingFailureStrategy : DecodingFailureStrategy
+ public var error : Error ?
+ public var animation : Animation ?
+ @propertyWrapper public struct ServerTimestamp < Value > : Codable where Value : ServerTimestampWrappable & Codable extension ServerTimestamp : Equatable where Value : Equatable extension ServerTimestamp : Hashable where Value : Hashable
+ public init ( wrappedValue value : Value ?)
+ public var wrappedValue : Value ? { get set }
+ public init ( from decoder : Decoder ) throws
+ public func encode ( to encoder : Encoder ) throws[ADDED] ProtocolsSwift:
+ public protocol DocumentIDWrappable
+ static func wrap ( _ documentReference : DocumentReference ) throws -> Self
+ public protocol ServerTimestampWrappable
+ static func wrap ( _ timestamp : Timestamp ) throws -> Self
+ static func unwrap ( _ value : Self ) throws -> Timestamp |
Coverage Report 1Affected Products
Test Logs |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This reverts commit a7e3720.
This rollback should fix the issue discussed in #11936 (comment).