make common BaseCellGenerator for table and collection

Author: NullIsOne

Components/Sources/Collection/CollectionWrappedCell.swift

@@ -9,7 +9,7 @@ import UIKit
 import ReactiveDataDisplayManager
 
 /// Empty collection cell with `View`. Configuration is implemented within `ViewWrapper`.
-public final class CollectionWrappedCell<View: ConfigurableItem & RegistrationTypeProvider>: UICollectionViewCell, ViewWrapper {
+public final class CollectionWrappedCell<View: BaseItem>: UICollectionViewCell, ViewWrapper {
 
     public typealias Model = View.Model
 

Components/Sources/Collection/DecorationProviders/CollectionDecorationProvider.swift

@@ -10,7 +10,7 @@ import ReactiveDataDisplayManager
 
 final class CollectionDecorationProvider<Cell: ConfigurableItem & UICollectionViewCell>: DecorationProvider where Cell.Model: Equatable {
 
-    typealias GeneratorType = DiffableCollectionCellGenerator<Cell>
+    typealias GeneratorType = DiffableCellGenerator<Cell>
 
     // MARK: - Properties
 

Components/Sources/Collection/Extensions/CollectionContext+CollectionWrappedCell.swift

@@ -14,14 +14,12 @@ extension CollectionContext: BuilderContext {
     public typealias ViewType = UICollectionViewCell
     public typealias GeneratorType = CollectionCellGenerator
 
-    public static func gen<Item>(_ type: Item.Type, model: Item.Model) -> GeneratorType where Item: ConfigurableItem,
-                                                                                                Item: RegistrationTypeProvider {
+    public static func gen<Item>(_ type: Item.Type, model: Item.Model) -> GeneratorType where Item: BaseItem {
         Item.rddm.collectionGenerator(with: model)
     }
 
     public static func gen<Item>(_ type: Item.Type, model: Item.Model) -> GeneratorType where Item: ViewType,
-                                                                                                Item: ConfigurableItem,
-                                                                                                Item: RegistrationTypeProvider {
+                                                                                                Item: BaseItem {
         Item.rddm.baseGenerator(with: model, and: Item.prefferedRegistration)
     }
 

Components/Sources/Collection/Extensions/CollectionWrappedCell+RDDM.swift

@@ -8,9 +8,9 @@
 import ReactiveDataDisplayManager
 import UIKit
 
-public extension StaticDataDisplayWrapper where Base: UIView & ConfigurableItem & RegistrationTypeProvider {
+public extension StaticDataDisplayWrapper where Base: UIView & BaseItem {
 
-    func collectionGenerator(with model: Base.Model) -> BaseCollectionCellGenerator<CollectionWrappedCell<Base>> {
+    func collectionGenerator(with model: Base.Model) -> BaseCellGenerator<CollectionWrappedCell<Base>> {
         CollectionWrappedCell<Base>.rddm.baseGenerator(with: model,
                                                        and: .class)
     }

Components/Sources/Table/Extensions/TableContext+TableWrappedCell.swift

@@ -14,14 +14,12 @@ extension TableContext: BuilderContext {
     public typealias ViewType = UITableViewCell
     public typealias GeneratorType = TableCellGenerator
 
-    public static func gen<Item>(_ type: Item.Type, model: Item.Model) -> GeneratorType where Item: ConfigurableItem,
-                                                                                                Item: RegistrationTypeProvider {
+    public static func gen<Item>(_ type: Item.Type, model: Item.Model) -> GeneratorType where Item: BaseItem {
         Item.rddm.tableGenerator(with: model)
     }
 
-    public static func gen<Item>(_ type: Item.Type, model: Item.Model) -> GeneratorType where Item: ViewType,
-                                                                                                Item: ConfigurableItem,
-                                                                                                Item: RegistrationTypeProvider {
+    public static func gen<Item>(_ type: Item.Type, model: Item.Model) -> any GeneratorType where Item: ViewType,
+                                                                                                Item: BaseItem {
         Item.rddm.baseGenerator(with: model, and: Item.prefferedRegistration)
     }
 

Components/Sources/Table/Extensions/TableWrappedCell+RDDM.swift

@@ -8,15 +8,15 @@
 import ReactiveDataDisplayManager
 import UIKit
 
-public extension StaticDataDisplayWrapper where Base: UIView & ConfigurableItem & RegistrationTypeProvider {
+public extension StaticDataDisplayWrapper where Base: UIView & BaseItem {
 
     func tableGenerator(with model: Base.Model) -> BaseCellGenerator<TableWrappedCell<Base>> {
         TableWrappedCell<Base>.rddm.baseGenerator(with: model, and: .class)
     }
 
 }
 
-public extension StaticDataDisplayWrapper where Base: UITableViewCell & ConfigurableItem & RegistrationTypeProvider {
+public extension StaticDataDisplayWrapper where Base: UITableViewCell & BaseItem {
 
     func tableGenerator(with model: Base.Model) -> BaseCellGenerator<Base> {
         Base.rddm.baseGenerator(with: model, and: Base.prefferedRegistration)

Components/Sources/Table/TableWrappedCell.swift

@@ -9,7 +9,7 @@ import UIKit
 import ReactiveDataDisplayManager
 
 /// Empty table cell with `View`. Configuration is implemented within `ViewWrapper`.
-public final class TableWrappedCell<View: ConfigurableItem & RegistrationTypeProvider>: UITableViewCell, ViewWrapper {
+public final class TableWrappedCell<View: BaseItem>: UITableViewCell, ViewWrapper {
 
     public typealias Model = View.Model
 

Example/ReactiveDataDisplayManager/Collection/DiffableCollectionViewController/DiffableCollectionViewController.swift

@@ -11,7 +11,7 @@ import ReactiveDataComponents
 @available(iOS 13.0, *)
 final class DiffableCollectionViewController: UIViewController {
 
-    typealias DiffableGenerator = DiffableCollectionCellGenerator<TitleCollectionListCell>
+    typealias DiffableGenerator = DiffableCellGenerator<TitleCollectionListCell>
 
     // MARK: - Constants
 

Example/ReactiveDataDisplayManager/Collection/DifferenceCollectionViewController/DifferenceCollectionViewController.swift

@@ -9,7 +9,7 @@ import ReactiveDataDisplayManager
 
 final class DifferenceCollectionViewController: UIViewController {
 
-    typealias DiffableGenerator = DiffableCollectionCellGenerator<TitleCollectionListCell>
+    typealias DiffableGenerator = DiffableCellGenerator<TitleCollectionListCell>
 
     // MARK: - Constants
 

Example/ReactiveDataDisplayManager/Collection/Views/Cells/DynamicHeightViewCell/DynamicHeightTableViewCell.swift

@@ -59,7 +59,7 @@ private extension DynamicHeightTableViewCell {
     }
 
     func makeDynamicHeightCellGenerators() -> [CollectionCellGenerator] {
-        return makeModels().map { BaseCollectionCellGenerator<RectangleColorCollectionViewCell>(with: $0) }
+        return makeModels().map { BaseCellGenerator<RectangleColorCollectionViewCell>(with: $0) }
     }
 
     func makeModels() -> [UIColor] {