Rename module builders as functions

This commit is contained in:
Davide 2024-11-17 22:30:22 +01:00
parent 8e7f3e80ce
commit db592944ec
No known key found for this signature in database
GPG Key ID: A48836171C759F5E
3 changed files with 8 additions and 8 deletions

View File

@ -62,7 +62,7 @@ private extension ProviderEntitySelector {
pp_log(.app, .info, "Select new provider entity: \(entity)")
do {
guard var moduleBuilder = module.asProviderModuleBuilder else {
guard var moduleBuilder = module.providerModuleBuilder() else {
assertionFailure("Module is not a ProviderModuleBuilder?")
return
}

View File

@ -189,7 +189,7 @@ extension ProfileEditor {
let profile = try builder.tryBuild()
// update local view
editableProfile.modules = profile.modulesBuilders
editableProfile.modules = profile.modulesBuilders()
removedModules.removeAll()
return profile

View File

@ -88,22 +88,22 @@ extension Profile {
EditableProfile(
id: id,
name: name,
modules: modulesBuilders,
modules: modulesBuilders(),
activeModulesIds: activeModulesIds,
modulesMetadata: modulesMetadata,
userInfo: userInfo
)
}
public var modulesBuilders: [any ModuleBuilder] {
public func modulesBuilders() -> [any ModuleBuilder] {
modules.compactMap {
$0.asModuleBuilder
$0.moduleBuilder()
}
}
}
extension Module {
public var asModuleBuilder: (any ModuleBuilder)? {
public func moduleBuilder() -> (any ModuleBuilder)? {
guard let buildableModule = self as? any BuildableType else {
return nil
}
@ -111,8 +111,8 @@ extension Module {
return builder as? any ModuleBuilder
}
public var asProviderModuleBuilder: (any ProviderModuleBuilder)? {
asModuleBuilder as? any ProviderModuleBuilder
public func providerModuleBuilder() -> (any ProviderModuleBuilder)? {
moduleBuilder() as? any ProviderModuleBuilder
}
}