Skip to content

Commit

Permalink
Added polyfills
Browse files Browse the repository at this point in the history
  • Loading branch information
alexeyzimarev committed Jun 12, 2024
1 parent 854e9b6 commit d12b00a
Show file tree
Hide file tree
Showing 6 changed files with 228 additions and 19 deletions.
2 changes: 1 addition & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<PropertyGroup Condition="'$(TargetFramework)' == 'net471' Or '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net48'">
<AddSystemTextJson>true</AddSystemTextJson>
<AddNullable>true</AddNullable>
<AddPolyfills>true</AddPolyfills>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All"/>
Expand Down
129 changes: 129 additions & 0 deletions src/RestSharp/Polyfills/Index.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#if !NET
using System.Runtime.CompilerServices;

// ReSharper disable once CheckNamespace
namespace System;

/// <summary>Represent a type can be used to index a collection either from the start or the end.</summary>
/// <remarks>
/// Index is used by the C# compiler to support the new index syntax
/// <code>
/// int[] someArray = new int[5] { 1, 2, 3, 4, 5 } ;
/// int lastElement = someArray[^1]; // lastElement = 5
/// </code>
/// </remarks>
readonly struct Index : IEquatable<Index> {
readonly int _value;

/// <summary>Construct an Index using a value and indicating if the index is from the start or from the end.</summary>
/// <param name="value">The index value. it has to be zero or positive number.</param>
/// <param name="fromEnd">Indicating if the index is from the start or from the end.</param>
/// <remarks>
/// If the Index constructed from the end, index value 1 means pointing at the last element and index value 0 means pointing at beyond last element.
/// </remarks>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public Index(int value, bool fromEnd = false) {
if (value < 0) {
throw new ArgumentOutOfRangeException(nameof(value), "value must be non-negative");
}

if (fromEnd)
_value = ~value;
else
_value = value;
}

// The following private constructors mainly created for perf reason to avoid the checks
Index(int value) => _value = value;

/// <summary>Create an Index pointing at first element.</summary>
public static Index Start => new(0);

/// <summary>Create an Index pointing at beyond last element.</summary>
public static Index End => new(~0);

/// <summary>Create an Index from the start at the position indicated by the value.</summary>
/// <param name="value">The index value from the start.</param>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Index FromStart(int value) {
if (value < 0) {
throw new ArgumentOutOfRangeException(nameof(value), "value must be non-negative");
}

return new Index(value);
}

/// <summary>Create an Index from the end at the position indicated by the value.</summary>
/// <param name="value">The index value from the end.</param>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Index FromEnd(int value) {
if (value < 0) {
throw new ArgumentOutOfRangeException(nameof(value), "value must be non-negative");
}

return new Index(~value);
}

/// <summary>Returns the index value.</summary>
public int Value {
get {
if (_value < 0)
return ~_value;
else
return _value;
}
}

/// <summary>Indicates whether the index is from the start or the end.</summary>
public bool IsFromEnd => _value < 0;

/// <summary>Calculate the offset from the start using the giving collection length.</summary>
/// <param name="length">The length of the collection that the Index will be used with. length has to be a positive value</param>
/// <remarks>
/// For performance reason, we don't validate the input length parameter and the returned offset value against negative values.
/// we don't validate either the returned offset is greater than the input length.
/// It is expected Index will be used with collections which always have non negative length/count. If the returned offset is negative and
/// then used to index a collection will get out of range exception which will be same affect as the validation.
/// </remarks>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public int GetOffset(int length) {
var offset = _value;

if (IsFromEnd) {
// offset = length - (~value)
// offset = length + (~(~value) + 1)
// offset = length + value + 1

offset += length + 1;
}

return offset;
}

/// <summary>Indicates whether the current Index object is equal to another object of the same type.</summary>
/// <param name="value">An object to compare with this object</param>
public override bool Equals(object? value) => value is Index && _value == ((Index)value)._value;

/// <summary>Indicates whether the current Index object is equal to another Index object.</summary>
/// <param name="other">An object to compare with this object</param>
public bool Equals(Index other) => _value == other._value;

/// <summary>Returns the hash code for this instance.</summary>
public override int GetHashCode() => _value;

/// <summary>Converts integer number to an Index.</summary>
public static implicit operator Index(int value) => FromStart(value);

/// <summary>Converts the value of the current Index object to its equivalent string representation.</summary>
public override string ToString() {
if (IsFromEnd)
return "^" + ((uint)Value).ToString();

return ((uint)Value).ToString();
}
}
#endif
81 changes: 81 additions & 0 deletions src/RestSharp/Polyfills/Range.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#if !NET
using System.Runtime.CompilerServices;

// ReSharper disable once CheckNamespace
namespace System;

/// <summary>Represent a range has start and end indexes.</summary>
/// <remarks>
/// Range is used by the C# compiler to support the range syntax.
/// <code>
/// int[] someArray = new int[5] { 1, 2, 3, 4, 5 };
/// int[] subArray1 = someArray[0..2]; // { 1, 2 }
/// int[] subArray2 = someArray[1..^0]; // { 2, 3, 4, 5 }
/// </code>
/// </remarks>
readonly struct Range : IEquatable<Range> {
/// <summary>Represent the inclusive start index of the Range.</summary>
public Index Start { get; }

/// <summary>Represent the exclusive end index of the Range.</summary>
public Index End { get; }

/// <summary>Construct a Range object using the start and end indexes.</summary>
/// <param name="start">Represent the inclusive start index of the range.</param>
/// <param name="end">Represent the exclusive end index of the range.</param>
public Range(Index start, Index end) {
Start = start;
End = end;
}

/// <summary>Indicates whether the current Range object is equal to another object of the same type.</summary>
/// <param name="value">An object to compare with this object</param>
public override bool Equals(object? value)
=> value is Range r &&
r.Start.Equals(Start) &&
r.End.Equals(End);

/// <summary>Indicates whether the current Range object is equal to another Range object.</summary>
/// <param name="other">An object to compare with this object</param>
public bool Equals(Range other) => other.Start.Equals(Start) && other.End.Equals(End);

/// <summary>Returns the hash code for this instance.</summary>
public override int GetHashCode() => Start.GetHashCode() * 31 + End.GetHashCode();

/// <summary>Converts the value of the current Range object to its equivalent string representation.</summary>
public override string ToString() => Start + ".." + End;

/// <summary>Create a Range object starting from start index to the end of the collection.</summary>
public static Range StartAt(Index start) => new Range(start, Index.End);

/// <summary>Create a Range object starting from first element in the collection to the end Index.</summary>
public static Range EndAt(Index end) => new Range(Index.Start, end);

/// <summary>Create a Range object starting from first element to the end.</summary>
public static Range All => new Range(Index.Start, Index.End);

/// <summary>Calculate the start offset and length of range object using a collection length.</summary>
/// <param name="length">The length of the collection that the range will be used with. length has to be a positive value.</param>
/// <remarks>
/// For performance reason, we don't validate the input length parameter against negative values.
/// It is expected Range will be used with collections which always have non negative length/count.
/// We validate the range is inside the length scope though.
/// </remarks>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
[CLSCompliant(false)]
public (int Offset, int Length) GetOffsetAndLength(int length) {
var start = Start.GetOffset(length);
var end = End.GetOffset(length);

if ((uint)end > (uint)length || (uint)start > (uint)end) {
throw new ArgumentOutOfRangeException(nameof(length));
}

return (start, end - start);
}
}
#endif
27 changes: 13 additions & 14 deletions src/RestSharp/Request/RestRequest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.

using System.Net;
using System.Net.Http.Headers;
using RestSharp.Authenticators;
using RestSharp.Extensions;
using RestSharp.Interceptors;

// ReSharper disable ReplaceSubstringWithRangeIndexer
// ReSharper disable UnusedAutoPropertyAccessor.Global

namespace RestSharp;
Expand Down Expand Up @@ -50,7 +48,7 @@ public RestRequest(string? resource, Method method = Method.Get) : this() {

if (queryStringStart < 0 || Resource.IndexOf('=') <= queryStringStart) return;

var queryParams = ParseQuery(Resource.Substring(queryStringStart + 1));
var queryParams = ParseQuery(Resource[(queryStringStart + 1)..]);
Resource = Resource.Substring(0, queryStringStart);

foreach (var param in queryParams) this.AddQueryParameter(param.Key, param.Value, false);
Expand All @@ -64,7 +62,7 @@ public RestRequest(string? resource, Method method = Method.Get) : this() {
var position = x.IndexOf('=');

return position > 0
? new KeyValuePair<string, string?>(x.Substring(0, position), x.Substring(position + 1))
? new KeyValuePair<string, string?>(x[..position], x[(position + 1)..])
: new KeyValuePair<string, string?>(x, null);
}
);
Expand All @@ -84,12 +82,12 @@ public RestRequest(Uri resource, Method method = Method.Get)
/// Always send a multipart/form-data request - even when no Files are present.
/// </summary>
public bool AlwaysMultipartFormData { get; set; }

/// <summary>
/// Always send a file as request content without multipart/form-data request - even when the request contains only one file parameter
/// </summary>
public bool AlwaysSingleFileAsContent { get; set; }

/// <summary>
/// When set to true, parameter values in a multipart form data requests will be enclosed in
/// quotation marks. Default is false. Enable it if the remote endpoint requires parameters
Expand Down Expand Up @@ -166,7 +164,7 @@ public RestRequest(Uri resource, Method method = Method.Get)
/// Can be used to skip container or root elements that do not have corresponding deserialization targets.
/// </summary>
public string? RootElement { get; set; }

/// <summary>
/// HTTP version for the request. Default is Version11.
/// </summary>
Expand Down Expand Up @@ -217,10 +215,9 @@ public RestRequest(Uri resource, Method method = Method.Get)
public Func<Stream, Stream?>? ResponseWriter {
get => _responseWriter;
set {
if (AdvancedResponseWriter != null)
throw new ArgumentException(
"AdvancedResponseWriter is not null. Only one response writer can be used."
);
if (AdvancedResponseWriter != null) {
throw new ArgumentException("AdvancedResponseWriter is not null. Only one response writer can be used.");
}

_responseWriter = value;
}
Expand All @@ -232,12 +229,14 @@ public RestRequest(Uri resource, Method method = Method.Get)
public Func<HttpResponseMessage, RestRequest, RestResponse>? AdvancedResponseWriter {
get => _advancedResponseHandler;
set {
if (ResponseWriter != null) throw new ArgumentException("ResponseWriter is not null. Only one response writer can be used.");
if (ResponseWriter != null) {
throw new ArgumentException("ResponseWriter is not null. Only one response writer can be used.");
}

_advancedResponseHandler = value;
}
}

/// <summary>
/// Request-level interceptors. Will be combined with client-level interceptors if set.
/// </summary>
Expand All @@ -260,4 +259,4 @@ public RestRequest RemoveParameter(Parameter parameter) {
}

internal RestRequest AddFile(FileParameter file) => this.With(x => x._files.Add(file));
}
}
2 changes: 1 addition & 1 deletion src/RestSharp/RestSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<Reference Include="System.Net.Http"/>
<Reference Include="System.Web"/>
</ItemGroup>
<ItemGroup Condition="$(AddNullable) == 'true'">
<ItemGroup Condition="$(AddPolyfills) == 'true'">
<PackageReference Include="Nullable" PrivateAssets="All"/>
</ItemGroup>
<ItemGroup Condition="$(AddSystemTextJson) == 'true'">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public sealed class IntegratedTests : IDisposable {

readonly WireMockServer _server = WireMockServer.Start();

[Fact]
[Fact, Obsolete("Obsolete")]
public async Task Use_with_GetJsonAsync() {
var data = Fixture.Create<TestClass>();
var serialized = JsonConvert.SerializeObject(data, JsonNetSerializer.DefaultSettings);
Expand All @@ -20,7 +20,7 @@ public async Task Use_with_GetJsonAsync() {

using var client = new RestClient(_server.Url!, configureSerialization: cfg => cfg.UseNewtonsoftJson());

var response = await client.GetJsonAsync<TestClass>("/test");
var response = await client.GetAsync<TestClass>("/test");

response.Should().BeEquivalentTo(data);
}
Expand All @@ -39,7 +39,7 @@ public async Task Use_with_GetJsonAsync_custom_settings() {

using var client = new RestClient(_server.Url!, configureSerialization: cfg => cfg.UseNewtonsoftJson(settings));

var response = await client.GetJsonAsync<TestClass>("/test");
var response = await client.GetAsync<TestClass>("/test");

response.Should().BeEquivalentTo(data);
}
Expand Down

0 comments on commit d12b00a

Please sign in to comment.