feat: Combining API for Configurator & Builder improved

Author: maximkrouk

Sources/FunctionalBuilder/Builder.swift

@@ -47,6 +47,20 @@ public struct Builder<Base> {
         reinforce { base in transform(&base, t0, t1, t2) }
     }
 
+    public func combined(with builder: Builder) -> Builder {
+        Builder(
+            _initialValue,
+            _configurator.combined(with: builder._configurator)
+        )
+    }
+    
+    public func combined(with configurator: Configurator<Base>) -> Builder {
+        Builder(
+            _initialValue,
+            _configurator.combined(with: configurator)
+        )
+    }
+    
     /// Creates a new instance of builder with initial value
     public init(_ initialValue: @escaping @autoclosure () -> Base) {
         self.init(

Sources/FunctionalClosures/DataSource.swift

@@ -35,7 +35,6 @@ public class DataSource<Input, Output> {
     }
 }
 
-
 /// A wrapper for clusure-based interaction between objects
 ///
 /// Provides a public API to set internal closure-based datasource with a functional API

Sources/FunctionalConfigurator/Configurator.swift

@@ -42,7 +42,12 @@ public struct Configurator<Base> {
         }
     }
 
+    public func combined(with configurator: Configurator) -> Configurator {
+        appendingConfiguration(configurator._configure)
+    }
+    
     /// Appends modification of a new configurator to stored configuration
+    @available(*, deprecated, message: "Use `combined(with:) instead`")
     public func appending(_ configurator: Configurator) -> Configurator {
         appendingConfiguration(configurator._configure)
     }
@@ -153,7 +158,7 @@ extension Configurator {
         ) -> Configurator {
             _block.configurator.appendingConfiguration { base in
                 _block.keyPath.embed(
-                    modification(of: _block.keyPath.extract(from: base), with: configuration),
+                    _modification(of: _block.keyPath.extract(from: base), with: configuration),
                     in: base
                 )
             }
@@ -200,7 +205,7 @@ extension Configurator {
         ) -> Configurator where Value: AnyObject {
             configurator.appendingConfiguration { base in
                 keyPath.embed(
-                    modification(of: keyPath.extract(from: base), with: configuration),
+                    _modification(of: keyPath.extract(from: base), with: configuration),
                     in: base
                 )
             }

Sources/FunctionalConfigurator/Modification.swift

@@ -2,6 +2,9 @@
 ///
 /// Returns a new instance for value types
 /// Returns modified reference for reference types
+@available(*, deprecated, message: """
+This function will be made internal in `1.0.0` release, implement `CustomConfigurable` protocol for your object and use instance method instead
+""")
 @inlinable
 public func modification<Object>(
     of object: Object,
@@ -10,3 +13,12 @@ public func modification<Object>(
     return Configurator(config: configuration)
         .configured(object)
 }
+
+
+@inlinable
+internal func _modification<Object>(
+    of object: Object,
+    with configuration: (Configurator<Object>) -> Configurator<Object>
+) -> Object {
+    return Configurator(config: configuration).configured(object)
+}