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

More subtype objc wrapping #402

Merged
merged 4 commits into from
Feb 9, 2024
Merged

More subtype objc wrapping #402

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b2eda1
point to new stone
julianlocke Feb 9, 2024
8966643
Run codegen
julianlocke Feb 9, 2024
236db45
point to latest stone
julianlocke Feb 9, 2024
fff2a61
point to latest stone
julianlocke Feb 9, 2024
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
11 changes: 11 additions & 0 deletions Source/SwiftyDropboxObjC/Shared/Generated/DBXCommon.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,17 @@ public class DBXCommonRootInfo: NSObject {
self.swift = swift
}

public static func wrapPreservingSubtypes(swift: Common.RootInfo) -> DBXCommonRootInfo {
switch swift {
case let teamRootInfo as Common.TeamRootInfo:
return DBXCommonTeamRootInfo(swift: teamRootInfo)
case let userRootInfo as Common.UserRootInfo:
return DBXCommonUserRootInfo(swift: userRootInfo)
default:
return DBXCommonRootInfo(swift: swift)
}
}

@objc
public override var description: String { swift.description }
}
Expand Down
123 changes: 33 additions & 90 deletions Source/SwiftyDropboxObjC/Shared/Generated/DBXFiles.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1309,16 +1309,7 @@ public class DBXFilesDeleteBatchResultData: NSObject {
/// Metadata of the deleted object.
@objc
public var metadata: DBXFilesMetadata {
switch swift.metadata {
case let fileMetadata as Files.FileMetadata:
return DBXFilesFileMetadata(swift: fileMetadata)
case let folderMetadata as Files.FolderMetadata:
return DBXFilesFolderMetadata(swift: folderMetadata)
case let deletedMetadata as Files.DeletedMetadata:
return DBXFilesDeletedMetadata(swift: deletedMetadata)
default:
return DBXFilesMetadata(swift: swift.metadata)
}
DBXFilesMetadata.wrapPreservingSubtypes(swift: swift.metadata)
}

@objc
Expand Down Expand Up @@ -1517,16 +1508,7 @@ public class DBXFilesDeleteResult: DBXFilesFileOpsResult {
/// Metadata of the deleted object.
@objc
public var metadata: DBXFilesMetadata {
switch subSwift.metadata {
case let fileMetadata as Files.FileMetadata:
return DBXFilesFileMetadata(swift: fileMetadata)
case let folderMetadata as Files.FolderMetadata:
return DBXFilesFolderMetadata(swift: folderMetadata)
case let deletedMetadata as Files.DeletedMetadata:
return DBXFilesDeletedMetadata(swift: deletedMetadata)
default:
return DBXFilesMetadata(swift: subSwift.metadata)
}
DBXFilesMetadata.wrapPreservingSubtypes(swift: subSwift.metadata)
}

@objc
Expand Down Expand Up @@ -1587,6 +1569,19 @@ public class DBXFilesMetadata: NSObject {
self.swift = swift
}

public static func wrapPreservingSubtypes(swift: Files.Metadata) -> DBXFilesMetadata {
switch swift {
case let fileMetadata as Files.FileMetadata:
return DBXFilesFileMetadata(swift: fileMetadata)
case let folderMetadata as Files.FolderMetadata:
return DBXFilesFolderMetadata(swift: folderMetadata)
case let deletedMetadata as Files.DeletedMetadata:
return DBXFilesDeletedMetadata(swift: deletedMetadata)
default:
return DBXFilesMetadata(swift: swift)
}
}

@objc
public override var description: String { swift.description }
}
Expand Down Expand Up @@ -2853,16 +2848,7 @@ public class DBXFilesGetCopyReferenceResult: NSObject {
/// Metadata of the file or folder.
@objc
public var metadata: DBXFilesMetadata {
switch swift.metadata {
case let fileMetadata as Files.FileMetadata:
return DBXFilesFileMetadata(swift: fileMetadata)
case let folderMetadata as Files.FolderMetadata:
return DBXFilesFolderMetadata(swift: folderMetadata)
case let deletedMetadata as Files.DeletedMetadata:
return DBXFilesDeletedMetadata(swift: deletedMetadata)
default:
return DBXFilesMetadata(swift: swift.metadata)
}
DBXFilesMetadata.wrapPreservingSubtypes(swift: swift.metadata)
}

/// A copy reference to the file or folder.
Expand Down Expand Up @@ -3869,16 +3855,7 @@ public class DBXFilesListFolderResult: NSObject {
@objc
public var entries: [DBXFilesMetadata] {
swift.entries.map {
switch $0 {
case let fileMetadata as Files.FileMetadata:
return DBXFilesFileMetadata(swift: fileMetadata)
case let folderMetadata as Files.FolderMetadata:
return DBXFilesFolderMetadata(swift: folderMetadata)
case let deletedMetadata as Files.DeletedMetadata:
return DBXFilesDeletedMetadata(swift: deletedMetadata)
default:
return DBXFilesMetadata(swift: $0)
}
DBXFilesMetadata.wrapPreservingSubtypes(swift: $0)
}
}

Expand Down Expand Up @@ -4368,16 +4345,7 @@ public class DBXFilesLockFileResult: NSObject {
/// Metadata of the file.
@objc
public var metadata: DBXFilesMetadata {
switch swift.metadata {
case let fileMetadata as Files.FileMetadata:
return DBXFilesFileMetadata(swift: fileMetadata)
case let folderMetadata as Files.FolderMetadata:
return DBXFilesFolderMetadata(swift: folderMetadata)
case let deletedMetadata as Files.DeletedMetadata:
return DBXFilesDeletedMetadata(swift: deletedMetadata)
default:
return DBXFilesMetadata(swift: swift.metadata)
}
DBXFilesMetadata.wrapPreservingSubtypes(swift: swift.metadata)
}

/// The file lock state after the operation.
Expand Down Expand Up @@ -4710,6 +4678,17 @@ public class DBXFilesMediaMetadata: NSObject {
self.swift = swift
}

public static func wrapPreservingSubtypes(swift: Files.MediaMetadata) -> DBXFilesMediaMetadata {
switch swift {
case let photoMetadata as Files.PhotoMetadata:
return DBXFilesPhotoMetadata(swift: photoMetadata)
case let videoMetadata as Files.VideoMetadata:
return DBXFilesVideoMetadata(swift: videoMetadata)
default:
return DBXFilesMediaMetadata(swift: swift)
}
}

@objc
public override var description: String { swift.description }
}
Expand Down Expand Up @@ -6899,16 +6878,7 @@ public class DBXFilesRelocationBatchResultData: NSObject {
/// Metadata of the relocated object.
@objc
public var metadata: DBXFilesMetadata {
switch swift.metadata {
case let fileMetadata as Files.FileMetadata:
return DBXFilesFileMetadata(swift: fileMetadata)
case let folderMetadata as Files.FolderMetadata:
return DBXFilesFolderMetadata(swift: folderMetadata)
case let deletedMetadata as Files.DeletedMetadata:
return DBXFilesDeletedMetadata(swift: deletedMetadata)
default:
return DBXFilesMetadata(swift: swift.metadata)
}
DBXFilesMetadata.wrapPreservingSubtypes(swift: swift.metadata)
}

@objc
Expand Down Expand Up @@ -7159,16 +7129,7 @@ public class DBXFilesRelocationResult: DBXFilesFileOpsResult {
/// Metadata of the relocated object.
@objc
public var metadata: DBXFilesMetadata {
switch subSwift.metadata {
case let fileMetadata as Files.FileMetadata:
return DBXFilesFileMetadata(swift: fileMetadata)
case let folderMetadata as Files.FolderMetadata:
return DBXFilesFolderMetadata(swift: folderMetadata)
case let deletedMetadata as Files.DeletedMetadata:
return DBXFilesDeletedMetadata(swift: deletedMetadata)
default:
return DBXFilesMetadata(swift: subSwift.metadata)
}
DBXFilesMetadata.wrapPreservingSubtypes(swift: subSwift.metadata)
}

@objc
Expand Down Expand Up @@ -7583,16 +7544,7 @@ public class DBXFilesSaveCopyReferenceResult: NSObject {
/// The metadata of the saved file or folder in the user's Dropbox.
@objc
public var metadata: DBXFilesMetadata {
switch swift.metadata {
case let fileMetadata as Files.FileMetadata:
return DBXFilesFileMetadata(swift: fileMetadata)
case let folderMetadata as Files.FolderMetadata:
return DBXFilesFolderMetadata(swift: folderMetadata)
case let deletedMetadata as Files.DeletedMetadata:
return DBXFilesDeletedMetadata(swift: deletedMetadata)
default:
return DBXFilesMetadata(swift: swift.metadata)
}
DBXFilesMetadata.wrapPreservingSubtypes(swift: swift.metadata)
}

@objc
Expand Down Expand Up @@ -8028,16 +7980,7 @@ public class DBXFilesSearchMatch: NSObject {
/// The metadata for the matched file or folder.
@objc
public var metadata: DBXFilesMetadata {
switch swift.metadata {
case let fileMetadata as Files.FileMetadata:
return DBXFilesFileMetadata(swift: fileMetadata)
case let folderMetadata as Files.FolderMetadata:
return DBXFilesFolderMetadata(swift: folderMetadata)
case let deletedMetadata as Files.DeletedMetadata:
return DBXFilesDeletedMetadata(swift: deletedMetadata)
default:
return DBXFilesMetadata(swift: swift.metadata)
}
DBXFilesMetadata.wrapPreservingSubtypes(swift: swift.metadata)
}

@objc
Expand Down
10 changes: 5 additions & 5 deletions Source/SwiftyDropboxObjC/Shared/Generated/DBXFilesRoutes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2412,7 +2412,7 @@ public class DBXFilesAlphaGetMetadataRpcRequest: NSObject, DBXRequest {

var objc: DBXFilesMetadata?
if let swift = result {
objc = DBXFilesMetadata(swift: swift)
objc = DBXFilesMetadata.wrapPreservingSubtypes(swift: swift)
}
completionHandler(objc, routeError, callError)
}
Expand Down Expand Up @@ -2619,7 +2619,7 @@ public class DBXFilesCopyRpcRequest: NSObject, DBXRequest {

var objc: DBXFilesMetadata?
if let swift = result {
objc = DBXFilesMetadata(swift: swift)
objc = DBXFilesMetadata.wrapPreservingSubtypes(swift: swift)
}
completionHandler(objc, routeError, callError)
}
Expand Down Expand Up @@ -3390,7 +3390,7 @@ public class DBXFilesDeleteRpcRequest: NSObject, DBXRequest {

var objc: DBXFilesMetadata?
if let swift = result {
objc = DBXFilesMetadata(swift: swift)
objc = DBXFilesMetadata.wrapPreservingSubtypes(swift: swift)
}
completionHandler(objc, routeError, callError)
}
Expand Down Expand Up @@ -4097,7 +4097,7 @@ public class DBXFilesGetMetadataRpcRequest: NSObject, DBXRequest {

var objc: DBXFilesMetadata?
if let swift = result {
objc = DBXFilesMetadata(swift: swift)
objc = DBXFilesMetadata.wrapPreservingSubtypes(swift: swift)
}
completionHandler(objc, routeError, callError)
}
Expand Down Expand Up @@ -5273,7 +5273,7 @@ public class DBXFilesMoveRpcRequest: NSObject, DBXRequest {

var objc: DBXFilesMetadata?
if let swift = result {
objc = DBXFilesMetadata(swift: swift)
objc = DBXFilesMetadata.wrapPreservingSubtypes(swift: swift)
}
completionHandler(objc, routeError, callError)
}
Expand Down
40 changes: 24 additions & 16 deletions Source/SwiftyDropboxObjC/Shared/Generated/DBXSharing.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1432,6 +1432,17 @@ public class DBXSharingLinkMetadata: NSObject {
self.swift = swift
}

public static func wrapPreservingSubtypes(swift: Sharing.LinkMetadata) -> DBXSharingLinkMetadata {
switch swift {
case let pathLinkMetadata as Sharing.PathLinkMetadata:
return DBXSharingPathLinkMetadata(swift: pathLinkMetadata)
case let collectionLinkMetadata as Sharing.CollectionLinkMetadata:
return DBXSharingCollectionLinkMetadata(swift: collectionLinkMetadata)
default:
return DBXSharingLinkMetadata(swift: swift)
}
}

@objc
public override var description: String { swift.description }
}
Expand Down Expand Up @@ -2174,6 +2185,17 @@ public class DBXSharingSharedLinkMetadata: NSObject {
self.swift = swift
}

public static func wrapPreservingSubtypes(swift: Sharing.SharedLinkMetadata) -> DBXSharingSharedLinkMetadata {
switch swift {
case let fileLinkMetadata as Sharing.FileLinkMetadata:
return DBXSharingFileLinkMetadata(swift: fileLinkMetadata)
case let folderLinkMetadata as Sharing.FolderLinkMetadata:
return DBXSharingFolderLinkMetadata(swift: folderLinkMetadata)
default:
return DBXSharingSharedLinkMetadata(swift: swift)
}
}

@objc
public override var description: String { swift.description }
}
Expand Down Expand Up @@ -3503,14 +3525,7 @@ public class DBXSharingGetSharedLinksResult: NSObject {
@objc
public var links: [DBXSharingLinkMetadata] {
swift.links.map {
switch $0 {
case let pathLinkMetadata as Sharing.PathLinkMetadata:
return DBXSharingPathLinkMetadata(swift: pathLinkMetadata)
case let collectionLinkMetadata as Sharing.CollectionLinkMetadata:
return DBXSharingCollectionLinkMetadata(swift: collectionLinkMetadata)
default:
return DBXSharingLinkMetadata(swift: $0)
}
DBXSharingLinkMetadata.wrapPreservingSubtypes(swift: $0)
}
}

Expand Down Expand Up @@ -5913,14 +5928,7 @@ public class DBXSharingListSharedLinksResult: NSObject {
@objc
public var links: [DBXSharingSharedLinkMetadata] {
swift.links.map {
switch $0 {
case let fileLinkMetadata as Sharing.FileLinkMetadata:
return DBXSharingFileLinkMetadata(swift: fileLinkMetadata)
case let folderLinkMetadata as Sharing.FolderLinkMetadata:
return DBXSharingFolderLinkMetadata(swift: folderLinkMetadata)
default:
return DBXSharingSharedLinkMetadata(swift: $0)
}
DBXSharingSharedLinkMetadata.wrapPreservingSubtypes(swift: $0)
}
}

Expand Down
10 changes: 5 additions & 5 deletions Source/SwiftyDropboxObjC/Shared/Generated/DBXSharingRoutes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1517,7 +1517,7 @@ public class DBXSharingCreateSharedLinkWithSettingsRpcRequest: NSObject, DBXRequ

var objc: DBXSharingSharedLinkMetadata?
if let swift = result {
objc = DBXSharingSharedLinkMetadata(swift: swift)
objc = DBXSharingSharedLinkMetadata.wrapPreservingSubtypes(swift: swift)
}
completionHandler(objc, routeError, callError)
}
Expand Down Expand Up @@ -1786,7 +1786,7 @@ public class DBXSharingGetSharedLinkFileDownloadRequestFile: NSObject, DBXReques
var objc: DBXSharingSharedLinkMetadata?
var destination: URL?
if let swift = result {
objc = DBXSharingSharedLinkMetadata(swift: swift.0)
objc = DBXSharingSharedLinkMetadata.wrapPreservingSubtypes(swift: swift.0)
destination = swift.1
}
completionHandler(objc, destination, routeError, callError)
Expand Down Expand Up @@ -1861,7 +1861,7 @@ public class DBXSharingGetSharedLinkFileDownloadRequestMemory: NSObject, DBXRequ
var objc: DBXSharingSharedLinkMetadata?
var destination: Data?
if let swift = result {
objc = DBXSharingSharedLinkMetadata(swift: swift.0)
objc = DBXSharingSharedLinkMetadata.wrapPreservingSubtypes(swift: swift.0)
destination = swift.1
}
completionHandler(objc, destination, routeError, callError)
Expand Down Expand Up @@ -1935,7 +1935,7 @@ public class DBXSharingGetSharedLinkMetadataRpcRequest: NSObject, DBXRequest {

var objc: DBXSharingSharedLinkMetadata?
if let swift = result {
objc = DBXSharingSharedLinkMetadata(swift: swift)
objc = DBXSharingSharedLinkMetadata.wrapPreservingSubtypes(swift: swift)
}
completionHandler(objc, routeError, callError)
}
Expand Down Expand Up @@ -2851,7 +2851,7 @@ public class DBXSharingModifySharedLinkSettingsRpcRequest: NSObject, DBXRequest

var objc: DBXSharingSharedLinkMetadata?
if let swift = result {
objc = DBXSharingSharedLinkMetadata(swift: swift)
objc = DBXSharingSharedLinkMetadata.wrapPreservingSubtypes(swift: swift)
}
completionHandler(objc, routeError, callError)
}
Expand Down
Loading
Loading