14.5.0

- Added 'useBaseUrl' and 'transformUrl' to Config for better composability
- Fixed some extension methods

Author: SchlenkR

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <Version>14.4.2</Version>
+    <Version>14.5.0</Version>
 
     <Authors>Ronald Schlenker</Authors>
     <Copyright>Copyright 2024 Ronald Schlenker</Copyright>
@@ -16,6 +16,10 @@
     <FsDocsReleaseNotesLink>https://www.nuget.org/packages/FsHttp#release-body-tab</FsDocsReleaseNotesLink>
 
     <PackageReleaseNotes>
+      14.5.0
+      - Added 'useBaseUrl' and 'transformUrl' to Config for better composability
+      - Fixed some extension methods
+
       14.4.2
       - Thanks @bartelink
         Pinned FSharp.Core to 5.0.2 in all library projects

docs/Composability.fsx

@@ -27,7 +27,13 @@ let httpForMySpecialEnvironment =
     let baseUrl = "http://my-special-environment"
     http {
         // we would like to have a fixed URL prefix for all requests.
-        // So we define a new builder that actually transforms the header.
+        // So we define a new builder that actually uses a base url, like so:
+        config_useBaseUrl baseUrl
+
+        // ...in case you need more control, you can also transform the URL:
+        config_transformUrl (fun url -> baseUrl </> url)
+
+        // ...or you can transform the header in a similar way.
         // Since the description of method is a special thing,
         // we have to change the URL for any method using a header transformer,
         // like so:

src/FsHttp/Dsl.CE.fs

@@ -441,6 +441,14 @@ type IRequestContext<'self> with
     member this.TransformHeader(context: IRequestContext<#IUpdateConfig<_>>, transformer) =
         Config.transformHeader transformer context.Self
 
+    [<CustomOperation("config_transformUrl")>]
+    member this.TransformUrl(context: IRequestContext<#IUpdateConfig<_>>, transformer) =
+        Config.transformUrl transformer context.Self
+    
+    [<CustomOperation("config_useBaseUrl")>]
+    member this.UseBaseUrl(context: IRequestContext<#IUpdateConfig<_>>, baseUrl) =
+        Config.useBaseUrl baseUrl context.Self
+
     [<CustomOperation("config_setHttpClientFactory")>]
     member this.SetHttpClientFactory(context: IRequestContext<#IUpdateConfig<_>>, httpClientFactory) =
         Config.setHttpClientFactory httpClientFactory context.Self

src/FsHttp/Dsl.fs

@@ -480,6 +480,14 @@ module Config =
         context.UpdateConfig(fun config -> 
             { config with headerTransformers = config.headerTransformers @ [ transformer ] })
 
+    let transformUrl transformer (context: IUpdateConfig<_>) =
+        context |> transformHeader (fun header ->
+            let address = transformer header.target.address.Value
+            { header with target.address = Some address })
+
+    let useBaseUrl (baseUrl: string) (context: IUpdateConfig<_>) =
+        context |> transformUrl (fun url -> Url.combine baseUrl url)
+
     let setHttpClientFactory httpClientFactory (context: IUpdateConfig<_>) =
         context.UpdateConfig(fun config -> 
             { config with httpClientFactory = httpClientFactory })

src/FsHttp/Extensions.fs

@@ -454,47 +454,55 @@ type ConfigExtensions =
 
     [<Extension>]
     static member TimeoutInSeconds(fluent: FluentConfig<_>, value) =
-        Config.timeoutInSeconds value
+        Config.timeoutInSeconds value fluent.Context
 
     [<Extension>]
     static member TransformHeader(fluent: FluentConfig<_>, transformer) =
-        Config.transformHeader transformer
+        Config.transformHeader transformer fluent.Context
+
+    [<Extension>]
+    static member TransformUrl(fluent: FluentConfig<_>, transformer) =
+        Config.transformUrl transformer fluent.Context
+
+    [<Extension>]
+    static member UseBaseUrl(fluent: FluentConfig<_>, baseUrl) =
+        Config.useBaseUrl baseUrl fluent.Context
 
     [<Extension>]
     static member SetHttpClientFactory(fluent: FluentConfig<_>, httpClientFactory) =
-        Config.setHttpClientFactory httpClientFactory
+        Config.setHttpClientFactory httpClientFactory fluent.Context
 
     [<Extension>]
     static member TransformHttpClient(fluent: FluentConfig<_>, transformer) =
-        Config.transformHttpClient transformer
+        Config.transformHttpClient transformer fluent.Context
 
     [<Extension>]
     static member TransformHttpRequestMessage(fluent: FluentConfig<_>, transformer) =
-        Config.transformHttpRequestMessage transformer
+        Config.transformHttpRequestMessage transformer fluent.Context
 
     [<Extension>]
     static member TransformHttpClientHandler(fluent: FluentConfig<_>, transformer) =
-        Config.transformHttpClientHandler transformer
+        Config.transformHttpClientHandler transformer fluent.Context
 
     [<Extension>]
     static member Proxy(fluent: FluentConfig<_>, url) =
-        Config.proxy url
+        Config.proxy url fluent.Context
 
     [<Extension>]
     static member Proxy(fluent: FluentConfig<_>, url, credentials) =
-        Config.proxyWithCredentials url credentials
+        Config.proxyWithCredentials url credentials fluent.Context
 
     [<Extension>]
     static member DecompressionMethods(fluent: FluentConfig<_>, decompressionMethods) =
-        Config.decompressionMethods decompressionMethods
+        Config.decompressionMethods decompressionMethods fluent.Context
 
     [<Extension>]
     static member NoDecompression(fluent: FluentConfig<_>) =
-        Config.noDecompression
+        Config.noDecompression fluent.Context
 
     [<Extension>]
     static member CancellationToken(fluent: FluentConfig<_>, cancellationToken) =
-        Config.cancellationToken cancellationToken
+        Config.cancellationToken cancellationToken fluent.Context
 
 
 // ---------