Update access level for types that will go into WordPressData – Round 2 (#24348)

* Update access level for types that will go into WordPressData

All the changes are extracted from the "work bench" work from
#24242 with the
goal of reducing that PRs diff size to make it easier to review and
identify errors.

* Fix (?) `NullBlogPropertySanitizer` compilation

* Update access level for more types that will go into WordPressData

Author: mokagio

WordPress/Classes/Extensions/NSManagedObject.swift

@@ -1,6 +1,6 @@
 import CoreData
 
-extension NSManagedObject {
+public extension NSManagedObject {
     func setRawValue<ValueType: RawRepresentable>(_ value: ValueType?, forKey key: String) {
         willChangeValue(forKey: key)
         setPrimitiveValue(value?.rawValue, forKey: key)

WordPress/Classes/Jetpack/Utility/SharedDataIssueSolver.swift

@@ -2,15 +2,15 @@ import WordPressShared
 import BuildSettingsKit
 
 @objcMembers
-final class SharedDataIssueSolver: NSObject {
+public final class SharedDataIssueSolver: NSObject {
 
     private let contextManager: CoreDataStack
     private let keychainUtils: KeychainUtils
     private let sharedDefaults: UserPersistentRepository?
     private let localFileStore: LocalFileStore
     private let appGroupName: String
 
-    init(contextManager: CoreDataStack = ContextManager.shared,
+    public init(contextManager: CoreDataStack = ContextManager.shared,
          keychainUtils: KeychainUtils = KeychainUtils(),
          sharedDefaults: UserPersistentRepository? = UserDefaults(suiteName: BuildSettings.current.appGroupName),
          localFileStore: LocalFileStore = FileManager.default,
@@ -28,7 +28,7 @@ final class SharedDataIssueSolver: NSObject {
         return SharedDataIssueSolver()
     }
 
-    func migrateAuthKey() {
+    public func migrateAuthKey() {
         guard let account = try? WPAccount.lookupDefaultWordPressComAccount(in: contextManager.mainContext),
               let username = account.username else {
             return
@@ -40,7 +40,7 @@ final class SharedDataIssueSolver: NSObject {
     /// To be safe, the method only "migrates" the data when the user is logged in, and there's a good chance that
     /// both apps are logged in with the same account.
     ///
-    func migrateAuthKey(for username: String) {
+    public func migrateAuthKey(for username: String) {
         guard AppConfiguration.isJetpack,
               let token = try? keychainUtils.getPassword(for: username, serviceName: WPAccountConstants.authToken.rawValue) else {
             return
@@ -60,7 +60,7 @@ final class SharedDataIssueSolver: NSObject {
                                  updateExisting: true)
     }
 
-    func migrateExtensionsData() {
+    public func migrateExtensionsData() {
         copyTodayWidgetDataToJetpack()
         copyShareExtensionDataToJetpack()
     }

WordPress/Classes/Models/AbstractPost.swift

@@ -1,7 +1,8 @@
 import Foundation
+import WordPressKit
 import WordPressShared
 
-extension AbstractPost {
+public extension AbstractPost {
     /// Returns the original post by navigating the entire list of revisions
     /// until it reaches the head.
     func original() -> AbstractPost {
@@ -106,7 +107,7 @@ extension AbstractPost {
 
         /// The keyPath to access the underlying property.
         ///
-        var keyPath: String {
+        public var keyPath: String {
             switch self {
             case .dateCreated:
                 return #keyPath(AbstractPost.date_created_gmt)
@@ -140,7 +141,7 @@ extension AbstractPost {
         }
     }
 
-    @objc override open func featuredImageURLForDisplay() -> URL? {
+    @objc override func featuredImageURLForDisplay() -> URL? {
         return featuredImageURL
     }
 

WordPress/Classes/Models/Account Settings/ManagedAccountSettings+CoreDataProperties.swift

@@ -3,7 +3,7 @@ import CoreData
 
 // MARK: - Encapsulates all of the ManagedAccountSettings Core Data properties.
 //
-extension ManagedAccountSettings {
+public extension ManagedAccountSettings {
     @NSManaged var firstName: String
     @NSManaged var lastName: String
     @NSManaged var displayName: String

WordPress/Classes/Models/Account Settings/ManagedAccountSettings.swift

@@ -4,15 +4,15 @@ import WordPressKit
 
 // MARK: - Reflects the user's Account Settings, as stored in Core Data.
 //
-class ManagedAccountSettings: NSManagedObject {
+public class ManagedAccountSettings: NSManagedObject {
 
     // MARK: - NSManagedObject
 
-    override class func entityName() -> String {
+    public override class func entityName() -> String {
         return "AccountSettings"
     }
 
-    func updateWith(_ accountSettings: AccountSettings) {
+    public func updateWith(_ accountSettings: AccountSettings) {
         firstName = accountSettings.firstName
         lastName = accountSettings.lastName
         displayName = accountSettings.displayName
@@ -38,7 +38,7 @@ class ManagedAccountSettings: NSManagedObject {
     ///
     /// - Returns: the change object needed to revert this change
     ///
-    func applyChange(_ change: AccountSettingsChange) -> AccountSettingsChange {
+    public func applyChange(_ change: AccountSettingsChange) -> AccountSettingsChange {
         let reverse = reverseChange(change)
 
         switch change {
@@ -95,7 +95,7 @@ class ManagedAccountSettings: NSManagedObject {
     }
 }
 
-extension AccountSettings {
+public extension AccountSettings {
     init(managed: ManagedAccountSettings) {
         self.init(firstName: managed.firstName.stringByDecodingXMLCharacters(),
                   lastName: managed.lastName.stringByDecodingXMLCharacters(),

WordPress/Classes/Models/Blog/Blog+Capabilities.swift

@@ -84,7 +84,7 @@ extension Blog {
     ///
     /// - Returns: Whether site management is permitted
     ///
-    @objc func supportsSiteManagementServices() -> Bool {
+    @objc public func supportsSiteManagementServices() -> Bool {
         return isHostedAtWPcom && isAdmin
     }
 }

WordPress/Classes/Models/BloggingPrompt+CoreDataClass.swift

@@ -17,7 +17,7 @@ public class BloggingPrompt: NSManagedObject {
         self.displayAvatarURLs = []
     }
 
-    var promptAttribution: BloggingPromptsAttribution? {
+    public var promptAttribution: BloggingPromptsAttribution? {
         BloggingPromptsAttribution(rawValue: attribution.lowercased())
     }
 
@@ -26,7 +26,7 @@ public class BloggingPrompt: NSManagedObject {
     /// - Parameters:
     ///   - remotePrompt: The remote prompt model to convert
     ///   - siteID: The ID of the site that the prompt is intended for
-    func configure(with remotePrompt: BloggingPromptRemoteObject, for siteID: Int32) {
+    public func configure(with remotePrompt: BloggingPromptRemoteObject, for siteID: Int32) {
         self.promptID = Int32(remotePrompt.promptID)
         self.siteID = siteID
         self.text = remotePrompt.text
@@ -42,7 +42,7 @@ public class BloggingPrompt: NSManagedObject {
         }
     }
 
-    func textForDisplay() -> String {
+    public func textForDisplay() -> String {
         return text.stringByDecodingXMLCharacters().trim()
     }
 
@@ -54,24 +54,24 @@ public class BloggingPrompt: NSManagedObject {
     /// - Parameters:
     ///   - localDate: The date to compare against in local timezone.
     /// - Returns: True if the year, month, and day components of the `localDate` matches the prompt's localized date.
-    func inSameDay(as dateToCompare: Date) -> Bool {
+    public func inSameDay(as dateToCompare: Date) -> Bool {
         return DateFormatters.utc.string(from: date) == DateFormatters.local.string(from: dateToCompare)
     }
 
     /// Used for comparison on upsert  – there can't be two `BloggingPrompt` objects with the same date, so we can use it as a unique identifier
     @objc
-    var dateString: String {
+    public var dateString: String {
         DateFormatters.local.string(from: date)
     }
 }
 
 // MARK: - Notification Payload
 
-extension BloggingPrompt {
+public extension BloggingPrompt {
 
     struct NotificationKeys {
-        static let promptID = "prompt_id"
-        static let siteID = "site_id"
+        public static let promptID = "prompt_id"
+        public static let siteID = "site_id"
     }
 
 }

WordPress/Classes/Models/BloggingPromptSettings+CoreDataClass.swift

@@ -4,7 +4,7 @@ import WordPressKit
 
 public class BloggingPromptSettings: NSManagedObject {
 
-    static func of(_ blog: Blog) throws -> BloggingPromptSettings? {
+    public static func of(_ blog: Blog) throws -> BloggingPromptSettings? {
         guard let context = blog.managedObjectContext else { return nil }
 
         // This getting site id logic is copied from the BloggingPromptsService initializer.
@@ -20,14 +20,14 @@ public class BloggingPromptSettings: NSManagedObject {
         return try lookup(withSiteID: siteID, in: context)
     }
 
-    static func lookup(withSiteID siteID: NSNumber, in context: NSManagedObjectContext) throws -> BloggingPromptSettings? {
+    public static func lookup(withSiteID siteID: NSNumber, in context: NSManagedObjectContext) throws -> BloggingPromptSettings? {
         let fetchRequest = BloggingPromptSettings.fetchRequest()
         fetchRequest.predicate = NSPredicate(format: "\(#keyPath(BloggingPromptSettings.siteID)) = %@", siteID)
         fetchRequest.fetchLimit = 1
         return try context.fetch(fetchRequest).first
     }
 
-    func reminderTimeDate() -> Date? {
+    public func reminderTimeDate() -> Date? {
         guard let reminderTime else {
             return nil
         }
@@ -37,7 +37,7 @@ public class BloggingPromptSettings: NSManagedObject {
     }
 }
 
-extension RemoteBloggingPromptsSettings {
+public extension RemoteBloggingPromptsSettings {
 
     init(with model: BloggingPromptSettings) {
         self.init(promptCardEnabled: model.promptCardEnabled,

WordPress/Classes/Models/BloggingPromptSettingsReminderDays+CoreDataClass.swift

@@ -4,7 +4,7 @@ import WordPressKit
 
 public class BloggingPromptSettingsReminderDays: NSManagedObject {
 
-    func configure(with remoteReminderDays: RemoteBloggingPromptsSettings.ReminderDays) {
+    public func configure(with remoteReminderDays: RemoteBloggingPromptsSettings.ReminderDays) {
         self.monday = remoteReminderDays.monday
         self.tuesday = remoteReminderDays.tuesday
         self.wednesday = remoteReminderDays.wednesday

WordPress/Classes/Models/Comment/Comment+CoreDataClass.swift

@@ -4,19 +4,19 @@ import CoreData
 @objc(Comment)
 public class Comment: NSManagedObject {
 
-    @objc static func descriptionFor(_ commentStatus: CommentStatusType) -> String {
+    @objc public static func descriptionFor(_ commentStatus: CommentStatusType) -> String {
         return commentStatus.description
     }
 
-    @objc func authorUrlForDisplay() -> String {
+    @objc public func authorUrlForDisplay() -> String {
         return authorURL()?.host ?? String()
     }
 
-    @objc func contentForEdit() -> String {
+    @objc public func contentForEdit() -> String {
         return availableContent()
     }
 
-    @objc func isApproved() -> Bool {
+    @objc public func isApproved() -> Bool {
         return status == CommentStatusType.approved.description
     }
 
@@ -31,7 +31,7 @@ public class Comment: NSManagedObject {
 
     // This can be removed when `unifiedCommentsAndNotificationsList` is permanently enabled
     // as it's replaced by Comment+Interface:relativeDateSectionIdentifier.
-    @objc func sectionIdentifier() -> String? {
+    @objc public func sectionIdentifier() -> String? {
         guard let dateCreated else {
             return nil
         }
@@ -42,30 +42,30 @@ public class Comment: NSManagedObject {
         return formatter.string(from: dateCreated)
     }
 
-    @objc func commentURL() -> URL? {
+    @objc public func commentURL() -> URL? {
         guard !link.isEmpty else {
             return nil
         }
 
         return URL(string: link)
     }
 
-    @objc func deleteWillBePermanent() -> Bool {
+    @objc public func deleteWillBePermanent() -> Bool {
         return status == Comment.descriptionFor(.spam) || status == Comment.descriptionFor(.unapproved)
    }
 
-    func canEditAuthorData() -> Bool {
+    public func canEditAuthorData() -> Bool {
         // If the authorID is zero, the user is unregistered. Therefore, the data can be edited.
         return authorID == 0
     }
 
-    func hasParentComment() -> Bool {
+    public func hasParentComment() -> Bool {
         return parentID > 0
     }
 
     /// Convenience method to check if the current user can actually moderate.
     /// `canModerate` is only applicable when the site is dotcom-related (hosted or atomic). For self-hosted sites, default to true.
-    @objc func allowsModeration() -> Bool {
+    @objc public func allowsModeration() -> Bool {
         if let _ = post as? ReaderPost {
             return canModerate
         }
@@ -76,15 +76,15 @@ public class Comment: NSManagedObject {
         return canModerate
     }
 
-    func canReply() -> Bool {
+    public func canReply() -> Bool {
         if let post = post as? ReaderPost {
             return post.commentsOpen
         }
         return !isReadOnly()
     }
 
     // NOTE: Comment Likes could be disabled, but the API doesn't have that info yet. Let's update this once it's available.
-    func canLike() -> Bool {
+    public func canLike() -> Bool {
         if (post as? ReaderPost) != nil {
             return true
         }
@@ -95,11 +95,11 @@ public class Comment: NSManagedObject {
         return !isReadOnly() && blog.supports(.commentLikes)
     }
 
-    @objc func isTopLevelComment() -> Bool {
+    @objc public func isTopLevelComment() -> Bool {
         return depth == 0
     }
 
-    func isFromPostAuthor() -> Bool {
+    public func isFromPostAuthor() -> Bool {
         guard let postAuthorID = post?.authorID?.int32Value,
               postAuthorID > 0,
               authorID > 0 else {
@@ -181,7 +181,7 @@ extension Comment: PostContentProvider {
 }
 
 // When CommentViewController and CommentService are converted to Swift, this can be simplified to a String enum.
-@objc enum CommentStatusType: Int {
+@objc public enum CommentStatusType: Int {
     case pending
     case approved
     case unapproved
@@ -190,7 +190,7 @@ extension Comment: PostContentProvider {
     // We can use this status to restore comment replies that the user has written.
     case draft
 
-    var description: String {
+    public var description: String {
         switch self {
         case .pending:
             return "hold"
@@ -205,7 +205,7 @@ extension Comment: PostContentProvider {
         }
     }
 
-    static func typeForStatus(_ status: String?) -> CommentStatusType? {
+    public static func typeForStatus(_ status: String?) -> CommentStatusType? {
         switch status {
         case "hold":
             return .pending