Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0f45b6b463 | |||
| 9485ad3ec4 | |||
| 595b63dc23 | |||
| dd81fecdd6 | |||
| 9c9b734c51 |
@@ -9,14 +9,18 @@ on:
|
||||
jobs:
|
||||
publish:
|
||||
runs-on: ubuntu-latest
|
||||
name: .NET tests
|
||||
|
||||
env:
|
||||
DOTNET_CLI_TELEMETRY_OPTOUT: true
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/checkout@v5
|
||||
|
||||
- name: Setup .NET
|
||||
uses: https://github.com/actions/setup-dotnet@v3
|
||||
uses: https://github.com/actions/setup-dotnet@v4
|
||||
with:
|
||||
dotnet-version: 8.x
|
||||
dotnet-version: 10.x
|
||||
|
||||
- name: Restore dependencies
|
||||
run: dotnet restore Railway/Railway.csproj
|
||||
|
||||
@@ -14,28 +14,47 @@ on:
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
name: .NET tests
|
||||
|
||||
env:
|
||||
DOTNET_CLI_TELEMETRY_OPTOUT: true
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/checkout@v5
|
||||
|
||||
- name: Setup .NET
|
||||
uses: https://github.com/actions/setup-dotnet@v3
|
||||
uses: https://github.com/actions/setup-dotnet@v4
|
||||
with:
|
||||
dotnet-version: 8.x
|
||||
dotnet-version: |
|
||||
8.0.x
|
||||
9.0.x
|
||||
10.0.x
|
||||
|
||||
- name: Restore dependencies
|
||||
run: dotnet restore
|
||||
|
||||
- name: Build
|
||||
run: dotnet build --no-restore
|
||||
- name: Build .NET 10.0
|
||||
run: dotnet build --no-restore --framework net10.0 --configuration Release ./Raliway.Tests/Raliway.Tests.csproj
|
||||
|
||||
- name: Test
|
||||
run: dotnet test --no-build --verbosity normal --logger trx --results-directory "TestResults-8.x"
|
||||
- name: Build .NET 9.0
|
||||
run: dotnet build --no-restore --framework net9.0 --configuration Release ./Raliway.Tests/Raliway.Tests.csproj
|
||||
|
||||
- name: Build .NET 8.0
|
||||
run: dotnet build --no-restore --framework net8.0 --configuration Release ./Raliway.Tests/Raliway.Tests.csproj
|
||||
|
||||
- name: Test .NET 10.0
|
||||
run: dotnet run --no-build --framework net10.0 --configuration Release --project ./Raliway.Tests/Raliway.Tests.csproj -- -trx TestResults/results-net10.trx
|
||||
|
||||
- name: Test .NET 9.0
|
||||
run: dotnet run --no-build --framework net9.0 --configuration Release --project ./Raliway.Tests/Raliway.Tests.csproj -- -trx TestResults/results-net9.trx
|
||||
|
||||
- name: Test .NET 8.0
|
||||
run: dotnet run --no-build --framework net8.0 --configuration Release --project ./Raliway.Tests/Raliway.Tests.csproj -- -trx TestResults/results-net8.trx
|
||||
|
||||
- name: Upload dotnet test results
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: dotnet-results-8.x
|
||||
path: TestResults-8.x
|
||||
name: test-results
|
||||
path: TestResults
|
||||
if: ${{ always() }}
|
||||
retention-days: 30
|
||||
|
||||
2
LICENSE
2
LICENSE
@@ -1,4 +1,4 @@
|
||||
Copyright (c) 2023-2024 JustFixMe
|
||||
Copyright (c) 2023-2025 JustFixMe
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
||||
@@ -13,6 +13,7 @@ public class ExtensionsMethodGenerator : IIncrementalGenerator
|
||||
new ResultMapExecutor(),
|
||||
new ResultBindExecutor(),
|
||||
new ResultTapExecutor(),
|
||||
new ResultExtendExecutor(),
|
||||
new ResultTryRecoverExecutor(),
|
||||
new ResultAppendExecutor(),
|
||||
new TryExtensionsExecutor(),
|
||||
|
||||
@@ -460,12 +460,4 @@ internal sealed class ResultAppendExecutor : ResultExtensionsExecutor
|
||||
}
|
||||
""");
|
||||
}
|
||||
|
||||
internal static string JoinArguments(string arg1, string arg2) => (arg1, arg2) switch
|
||||
{
|
||||
("", "") => "",
|
||||
(string arg, "") => arg,
|
||||
("", string arg) => arg,
|
||||
_ => $"{arg1}, {arg2}"
|
||||
};
|
||||
}
|
||||
|
||||
160
Railway.SourceGenerator/ResultExtendExecutor.cs
Normal file
160
Railway.SourceGenerator/ResultExtendExecutor.cs
Normal file
@@ -0,0 +1,160 @@
|
||||
using System.Collections.Immutable;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using Microsoft.CodeAnalysis;
|
||||
|
||||
namespace Just.Railway.SourceGen;
|
||||
|
||||
internal sealed class ResultExtendExecutor : ResultExtensionsExecutor
|
||||
{
|
||||
protected override string ExtensionType => "Extend";
|
||||
|
||||
protected override void GenerateMethodsForArgCount(StringBuilder sb, int argCount)
|
||||
{
|
||||
if (argCount == 0 || argCount == Constants.MaxResultTupleSize)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var templateArgNames = Enumerable.Range(1, argCount)
|
||||
.Select(i => $"T{i}")
|
||||
.ToImmutableArray();
|
||||
|
||||
var expandedTemplateArgNames = templateArgNames.Add("R");
|
||||
string resultTypeDef = GenerateResultTypeDef(templateArgNames);
|
||||
string resultValueExpansion = GenerateResultValueExpansion(templateArgNames);
|
||||
string resultExpandedTypeDef = GenerateResultTypeDef(expandedTemplateArgNames);
|
||||
string methodTemplateDecl = GenerateTemplateDecl(expandedTemplateArgNames);
|
||||
string bindTemplateDecl = GenerateTemplateDecl(templateArgNames.Add("Result<R>"));
|
||||
|
||||
sb.AppendLine($"#region {resultTypeDef}");
|
||||
|
||||
sb.AppendLine($$"""
|
||||
[PureAttribute]
|
||||
[GeneratedCodeAttribute("{{nameof(ResultExtendExecutor)}}", "1.0.0.0")]
|
||||
public static {{resultExpandedTypeDef}} Extend{{methodTemplateDecl}}(this in {{resultTypeDef}} result, Func{{bindTemplateDecl}} extensionFunc)
|
||||
{
|
||||
if (result.State == ResultState.Bottom)
|
||||
{
|
||||
throw new ResultNotInitializedException(nameof(result));
|
||||
}
|
||||
else if (result.IsFailure)
|
||||
{
|
||||
return result.Error!;
|
||||
}
|
||||
|
||||
var extension = extensionFunc({{resultValueExpansion}});
|
||||
if (extension.State == ResultState.Bottom)
|
||||
{
|
||||
throw new ResultNotInitializedException(nameof(extensionFunc));
|
||||
}
|
||||
else if (extension.IsFailure)
|
||||
{
|
||||
return extension.Error!;
|
||||
}
|
||||
|
||||
return Result.Success({{JoinArguments(resultValueExpansion, "extension.Value")}});
|
||||
}
|
||||
""");
|
||||
|
||||
GenerateAsyncMethods("Task", sb, templateArgNames, resultTypeDef, resultValueExpansion);
|
||||
GenerateAsyncMethods("ValueTask", sb, templateArgNames, resultTypeDef, resultValueExpansion);
|
||||
|
||||
sb.AppendLine("#endregion");
|
||||
}
|
||||
|
||||
private static void GenerateAsyncMethods(string taskType, StringBuilder sb, ImmutableArray<string> templateArgNames, string resultTypeDef, string resultValueExpansion)
|
||||
{
|
||||
var expandedTemplateArgNames = templateArgNames.Add("R");
|
||||
string resultExpandedTypeDef = GenerateResultTypeDef(expandedTemplateArgNames);
|
||||
string methodTemplateDecl = GenerateTemplateDecl(expandedTemplateArgNames);
|
||||
string bindTemplateDecl = GenerateTemplateDecl(templateArgNames.Add("Result<R>"));
|
||||
string asyncActionTemplateDecl = GenerateTemplateDecl(templateArgNames.Add($"{taskType}<Result<R>>"));
|
||||
|
||||
sb.AppendLine($$"""
|
||||
[PureAttribute]
|
||||
[GeneratedCodeAttribute("{{nameof(ResultExtendExecutor)}}", "1.0.0.0")]
|
||||
public static async {{taskType}}<{{resultExpandedTypeDef}}> Extend{{methodTemplateDecl}}(this {{taskType}}<{{resultTypeDef}}> resultTask, Func{{bindTemplateDecl}} extensionFunc)
|
||||
{
|
||||
var result = await resultTask.ConfigureAwait(false);
|
||||
if (result.State == ResultState.Bottom)
|
||||
{
|
||||
throw new ResultNotInitializedException(nameof(resultTask));
|
||||
}
|
||||
else if (result.IsFailure)
|
||||
{
|
||||
return result.Error!;
|
||||
}
|
||||
|
||||
var extension = extensionFunc({{resultValueExpansion}});
|
||||
if (extension.State == ResultState.Bottom)
|
||||
{
|
||||
throw new ResultNotInitializedException(nameof(extensionFunc));
|
||||
}
|
||||
else if (extension.IsFailure)
|
||||
{
|
||||
return extension.Error!;
|
||||
}
|
||||
|
||||
return Result.Success({{JoinArguments(resultValueExpansion, "extension.Value")}});
|
||||
}
|
||||
""");
|
||||
|
||||
sb.AppendLine($$"""
|
||||
[PureAttribute]
|
||||
[GeneratedCodeAttribute("{{nameof(ResultExtendExecutor)}}", "1.0.0.0")]
|
||||
public static async {{taskType}}<{{resultExpandedTypeDef}}> Extend{{methodTemplateDecl}}(this {{resultTypeDef}} result, Func{{asyncActionTemplateDecl}} extensionFunc)
|
||||
{
|
||||
if (result.State == ResultState.Bottom)
|
||||
{
|
||||
throw new ResultNotInitializedException(nameof(result));
|
||||
}
|
||||
else if (result.IsFailure)
|
||||
{
|
||||
return result.Error!;
|
||||
}
|
||||
|
||||
var extension = await extensionFunc({{resultValueExpansion}}).ConfigureAwait(false);
|
||||
if (extension.State == ResultState.Bottom)
|
||||
{
|
||||
throw new ResultNotInitializedException(nameof(extensionFunc));
|
||||
}
|
||||
else if (extension.IsFailure)
|
||||
{
|
||||
return extension.Error!;
|
||||
}
|
||||
|
||||
return Result.Success({{JoinArguments(resultValueExpansion, "extension.Value")}});
|
||||
}
|
||||
""");
|
||||
|
||||
sb.AppendLine($$"""
|
||||
[PureAttribute]
|
||||
[GeneratedCodeAttribute("{{nameof(ResultExtendExecutor)}}", "1.0.0.0")]
|
||||
public static async {{taskType}}<{{resultExpandedTypeDef}}> Extend{{methodTemplateDecl}}(this {{taskType}}<{{resultTypeDef}}> resultTask, Func{{asyncActionTemplateDecl}} extensionFunc)
|
||||
{
|
||||
var result = await resultTask.ConfigureAwait(false);
|
||||
if (result.State == ResultState.Bottom)
|
||||
{
|
||||
throw new ResultNotInitializedException(nameof(resultTask));
|
||||
}
|
||||
else if (result.IsFailure)
|
||||
{
|
||||
return result.Error!;
|
||||
}
|
||||
|
||||
var extension = await extensionFunc({{resultValueExpansion}}).ConfigureAwait(false);
|
||||
if (extension.State == ResultState.Bottom)
|
||||
{
|
||||
throw new ResultNotInitializedException(nameof(extensionFunc));
|
||||
}
|
||||
else if (extension.IsFailure)
|
||||
{
|
||||
return extension.Error!;
|
||||
}
|
||||
|
||||
return Result.Success({{JoinArguments(resultValueExpansion, "extension.Value")}});
|
||||
}
|
||||
""");
|
||||
}
|
||||
}
|
||||
@@ -50,6 +50,13 @@ internal abstract class ResultExtensionsExecutor : IGeneratorExecutor
|
||||
1 => $"Result<{string.Join(", ", templateArgNames)}>",
|
||||
_ => $"Result<({string.Join(", ", templateArgNames)})>",
|
||||
};
|
||||
protected static string JoinArguments(string arg1, string arg2) => (arg1, arg2) switch
|
||||
{
|
||||
("", "") => "",
|
||||
(string arg, "") => arg,
|
||||
("", string arg) => arg,
|
||||
_ => $"{arg1}, {arg2}"
|
||||
};
|
||||
|
||||
protected static string GenerateResultValueExpansion(ImmutableArray<string> templateArgNames)
|
||||
{
|
||||
|
||||
137
Railway/Error.cs
137
Railway/Error.cs
@@ -52,7 +52,7 @@ public abstract class Error : IEquatable<Error>, IComparable<Error>
|
||||
[Pure, MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static Error Many(Error error1, Error error2) => (error1, error2) switch
|
||||
{
|
||||
(null, null) => new ManyErrors(new List<Error>()),
|
||||
(null, null) => new ManyErrors(ImmutableArray<Error>.Empty),
|
||||
(Error err, null) => err,
|
||||
(Error err, { IsEmpty: true }) => err,
|
||||
(null, Error err) => err,
|
||||
@@ -137,12 +137,14 @@ public abstract class Error : IEquatable<Error>, IComparable<Error>
|
||||
return string.Compare(Message, other.Message);
|
||||
}
|
||||
|
||||
[Pure] public override string ToString() => Message;
|
||||
[Pure] public sealed override string ToString() => Message;
|
||||
[Pure] public void Deconstruct(out string type, out string message)
|
||||
{
|
||||
type = Type;
|
||||
message = Message;
|
||||
}
|
||||
|
||||
[Pure, MethodImpl(MethodImplOptions.AggressiveInlining)] internal virtual Error AccessUnsafe(int position) => this;
|
||||
}
|
||||
|
||||
[JsonConverter(typeof(ExpectedErrorJsonConverter))]
|
||||
@@ -219,78 +221,93 @@ public sealed class ExceptionalError : Error
|
||||
private static ImmutableDictionary<string, string> ExtractExtensionData(Exception exception)
|
||||
{
|
||||
if (!(exception.Data?.Count > 0))
|
||||
return ImmutableDictionary<string, string>.Empty;
|
||||
return ImmutableDictionary<string, string>.Empty;
|
||||
|
||||
List<KeyValuePair<string, string>>? values = null;
|
||||
var values = GetGenericExtData(exception);
|
||||
|
||||
foreach (var key in exception.Data.Keys)
|
||||
return values is not null ? values.ToImmutable() : ImmutableDictionary<string, string>.Empty;
|
||||
}
|
||||
|
||||
private static ImmutableDictionary<string, string>.Builder? GetGenericExtData(Exception ex)
|
||||
{
|
||||
ImmutableDictionary<string, string>.Builder? values = null;
|
||||
|
||||
foreach (var key in ex.Data.Keys)
|
||||
{
|
||||
if (key is null) continue;
|
||||
|
||||
var value = exception.Data[key];
|
||||
var value = ex.Data[key];
|
||||
if (value is null) continue;
|
||||
|
||||
var keyString = key.ToString();
|
||||
var valueString = value.ToString();
|
||||
if (string.IsNullOrEmpty(keyString) || string.IsNullOrEmpty(valueString)) continue;
|
||||
|
||||
values ??= new List<KeyValuePair<string, string>>(4);
|
||||
values.Add(new(keyString, valueString));
|
||||
values ??= ImmutableDictionary.CreateBuilder<string, string>();
|
||||
values.Add(keyString, valueString);
|
||||
}
|
||||
return values?.ToImmutableDictionary() ?? ImmutableDictionary<string, string>.Empty;
|
||||
|
||||
return values;
|
||||
}
|
||||
}
|
||||
|
||||
[JsonConverter(typeof(ManyErrorsJsonConverter))]
|
||||
public sealed class ManyErrors : Error, IEnumerable<Error>, IReadOnlyList<Error>
|
||||
{
|
||||
private readonly List<Error> _errors;
|
||||
private readonly ImmutableArray<Error> _errors;
|
||||
[Pure] public IEnumerable<Error> Errors { get => _errors; }
|
||||
|
||||
internal ManyErrors(List<Error> errors) => _errors = errors;
|
||||
internal ManyErrors(ImmutableArray<Error> errors) => _errors = errors;
|
||||
internal ManyErrors(Error head, Error tail)
|
||||
{
|
||||
_errors = new List<Error>(head.Count + tail.Count);
|
||||
var headCount = head.Count;
|
||||
var tailCount = tail.Count;
|
||||
var errors = ImmutableArray.CreateBuilder<Error>(headCount + tailCount);
|
||||
|
||||
if (head.Count == 1)
|
||||
_errors.Add(head);
|
||||
else if (head.Count > 1)
|
||||
_errors.AddRange(head.ToEnumerable());
|
||||
if (headCount > 0)
|
||||
AppendSanitized(errors, head);
|
||||
|
||||
if (tail.Count == 1)
|
||||
_errors.Add(tail);
|
||||
else if (tail.Count > 1)
|
||||
_errors.AddRange(tail.ToEnumerable());
|
||||
if (tailCount > 0)
|
||||
AppendSanitized(errors, tail);
|
||||
|
||||
_errors = errors.MoveToImmutable();
|
||||
}
|
||||
public ManyErrors(IEnumerable<Error> errors)
|
||||
{
|
||||
_errors = errors.SelectMany(x => x.ToEnumerable())
|
||||
.Where(x => !x.IsEmpty)
|
||||
.ToList();
|
||||
var unpackedErrors = ImmutableArray.CreateBuilder<Error>();
|
||||
|
||||
foreach (var err in errors)
|
||||
{
|
||||
if (err.IsEmpty) continue;
|
||||
|
||||
AppendSanitized(unpackedErrors, err);
|
||||
}
|
||||
|
||||
_errors = unpackedErrors.ToImmutable();
|
||||
}
|
||||
|
||||
[Pure] public override string Type => "many_errors";
|
||||
[Pure] public override string Message => ToFullArrayString();
|
||||
[Pure] public override string ToString() => ToFullArrayString();
|
||||
|
||||
[Pure] private string ToFullArrayString()
|
||||
private string? _lazyMessage = null;
|
||||
[Pure] public override string Message => _lazyMessage ??= ToFullArrayString(_errors);
|
||||
|
||||
[Pure] private static string ToFullArrayString(in ImmutableArray<Error> errors)
|
||||
{
|
||||
var separator = Environment.NewLine;
|
||||
var lastIndex = _errors.Count - 1;
|
||||
|
||||
var sb = new StringBuilder();
|
||||
for (int i = 0; i < _errors.Count; i++)
|
||||
for (int i = 0; i < errors.Length; i++)
|
||||
{
|
||||
sb.Append(_errors[i]);
|
||||
if (i < lastIndex)
|
||||
sb.Append(separator);
|
||||
sb.Append(errors[i]);
|
||||
sb.Append(separator);
|
||||
}
|
||||
sb.Remove(sb.Length - separator.Length, separator.Length);
|
||||
|
||||
return sb.ToString();
|
||||
}
|
||||
|
||||
[Pure] public override int Count => _errors.Count;
|
||||
[Pure] public override bool IsEmpty => _errors.Count == 0;
|
||||
[Pure] public override int Count => _errors.Length;
|
||||
[Pure] public override bool IsEmpty => _errors.IsEmpty;
|
||||
[Pure] public override bool IsExpected => _errors.All(static x => x.IsExpected);
|
||||
[Pure] public override bool IsExeptional => _errors.Any(static x => x.IsExeptional);
|
||||
|
||||
@@ -303,22 +320,19 @@ public sealed class ManyErrors : Error, IEnumerable<Error>, IReadOnlyList<Error>
|
||||
{
|
||||
if (other is null)
|
||||
return -1;
|
||||
if (other.Count != _errors.Count)
|
||||
return _errors.Count.CompareTo(other.Count);
|
||||
if (other.Count != _errors.Length)
|
||||
return _errors.Length.CompareTo(other.Count);
|
||||
|
||||
var compareResult = 0;
|
||||
int i = 0;
|
||||
foreach (var otherErr in other.ToEnumerable())
|
||||
for (int i = 0; i < _errors.Length; i++)
|
||||
{
|
||||
var thisErr = _errors[i++];
|
||||
compareResult = thisErr.CompareTo(otherErr);
|
||||
var compareResult = _errors[i].CompareTo(other.AccessUnsafe(i));
|
||||
if (compareResult != 0)
|
||||
{
|
||||
return compareResult;
|
||||
}
|
||||
}
|
||||
|
||||
return compareResult;
|
||||
return 0;
|
||||
}
|
||||
[Pure] public override bool IsSimilarTo([NotNullWhen(true)] Error? other)
|
||||
{
|
||||
@@ -326,15 +340,13 @@ public sealed class ManyErrors : Error, IEnumerable<Error>, IReadOnlyList<Error>
|
||||
{
|
||||
return false;
|
||||
}
|
||||
if (_errors.Count != other.Count)
|
||||
if (_errors.Length != other.Count)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
int i = 0;
|
||||
foreach (var otherErr in other.ToEnumerable())
|
||||
for (int i = 0; i < _errors.Length; i++)
|
||||
{
|
||||
var thisErr = _errors[i++];
|
||||
if (!thisErr.IsSimilarTo(otherErr))
|
||||
if (!_errors[i].IsSimilarTo(other.AccessUnsafe(i)))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@@ -347,36 +359,49 @@ public sealed class ManyErrors : Error, IEnumerable<Error>, IReadOnlyList<Error>
|
||||
{
|
||||
return false;
|
||||
}
|
||||
if (_errors.Count != other.Count)
|
||||
if (_errors.Length != other.Count)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
int i = 0;
|
||||
foreach (var otherErr in other.ToEnumerable())
|
||||
for (int i = 0; i < _errors.Length; i++)
|
||||
{
|
||||
var thisErr = _errors[i++];
|
||||
if (!thisErr.Equals(otherErr))
|
||||
if (!_errors[i].Equals(other.AccessUnsafe(i)))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
[Pure] public override int GetHashCode()
|
||||
|
||||
private int? _lazyHashCode = null;
|
||||
[Pure] public override int GetHashCode() => _lazyHashCode ??= CalcHashCode(_errors);
|
||||
private static int CalcHashCode(in ImmutableArray<Error> errors)
|
||||
{
|
||||
if (_errors.Count == 0)
|
||||
if (errors.IsEmpty)
|
||||
return 0;
|
||||
|
||||
var hash = new HashCode();
|
||||
foreach (var err in _errors)
|
||||
foreach (var err in errors)
|
||||
{
|
||||
hash.Add(err);
|
||||
}
|
||||
return hash.ToHashCode();
|
||||
}
|
||||
|
||||
[Pure] public IEnumerator<Error> GetEnumerator() => _errors.GetEnumerator();
|
||||
[Pure] IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
|
||||
|
||||
[Pure] public ImmutableArray<Error>.Enumerator GetEnumerator() => _errors.GetEnumerator();
|
||||
[Pure] IEnumerator<Error> IEnumerable<Error>.GetEnumerator() => Errors.GetEnumerator();
|
||||
[Pure] IEnumerator IEnumerable.GetEnumerator() => Errors.GetEnumerator();
|
||||
|
||||
internal static void AppendSanitized(ImmutableArray<Error>.Builder errors, Error error)
|
||||
{
|
||||
if (error is ManyErrors many)
|
||||
errors.AddRange(many._errors);
|
||||
else
|
||||
errors.Add(error);
|
||||
}
|
||||
|
||||
[Pure, MethodImpl(MethodImplOptions.AggressiveInlining)] internal override Error AccessUnsafe(int position) => _errors[position];
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
|
||||
@@ -35,7 +35,7 @@ public sealed class ErrorJsonConverter : JsonConverter<Error>
|
||||
|
||||
internal static ManyErrors ReadMany(ref Utf8JsonReader reader)
|
||||
{
|
||||
List<Error> errors = new(4);
|
||||
var errors = ImmutableArray.CreateBuilder<Error>();
|
||||
while (reader.Read())
|
||||
{
|
||||
if (reader.TokenType == JsonTokenType.StartObject)
|
||||
@@ -43,7 +43,7 @@ public sealed class ErrorJsonConverter : JsonConverter<Error>
|
||||
errors.Add(ToExpectedError(ReadOne(ref reader)));
|
||||
}
|
||||
}
|
||||
return new ManyErrors(errors);
|
||||
return new ManyErrors(errors.ToImmutable());
|
||||
}
|
||||
internal static ExpectedError ToExpectedError(in (string Type, string Message, ImmutableDictionary<string, string> ExtensionData) errorInfo)
|
||||
=> new(errorInfo.Type, errorInfo.Message) { ExtensionData = errorInfo.ExtensionData };
|
||||
@@ -84,7 +84,7 @@ public sealed class ErrorJsonConverter : JsonConverter<Error>
|
||||
else if (!string.IsNullOrEmpty(propname))
|
||||
{
|
||||
extensionData ??= ImmutableDictionary.CreateBuilder<string, string>();
|
||||
extensionData.Add(propname, propvalue);
|
||||
extensionData[propname] = propvalue;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
|
||||
<LangVersion>10.0</LangVersion>
|
||||
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
|
||||
<LangVersion>12.0</LangVersion>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<AssemblyName>Just.Railway</AssemblyName>
|
||||
@@ -11,7 +11,7 @@
|
||||
<Description>Base for railway-oriented programming in .NET. Package includes Result object, Error class and most of the common extensions.</Description>
|
||||
<PackageTags>railway-oriented;functional;result-pattern;result-object;error-handling</PackageTags>
|
||||
<Authors>JustFixMe</Authors>
|
||||
<Copyright>Copyright (c) 2023-2024 JustFixMe</Copyright>
|
||||
<Copyright>Copyright (c) 2023-2025 JustFixMe</Copyright>
|
||||
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||
<RepositoryUrl>https://github.com/JustFixMe/Just.Railway/</RepositoryUrl>
|
||||
|
||||
@@ -7,7 +7,13 @@ internal enum ResultState : byte
|
||||
|
||||
public readonly partial struct Result : IEquatable<Result>
|
||||
{
|
||||
internal SuccessUnit Value => new();
|
||||
[SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "Simplified source generation")]
|
||||
internal SuccessUnit Value
|
||||
{
|
||||
[Pure, MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
get => new();
|
||||
}
|
||||
|
||||
internal readonly Error? Error;
|
||||
internal readonly ResultState State;
|
||||
|
||||
@@ -36,12 +42,18 @@ public readonly partial struct Result : IEquatable<Result>
|
||||
public static Result<(T1, T2, T3, T4, T5)> Success<T1, T2, T3, T4, T5>(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5) => new((value1, value2, value3, value4, value5));
|
||||
|
||||
|
||||
[Pure, MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static Result Failure(string error) => Error.New(error ?? throw new ArgumentNullException(nameof(error)));
|
||||
|
||||
[Pure, MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static Result Failure(Error error) => new(error ?? throw new ArgumentNullException(nameof(error)));
|
||||
|
||||
[Pure, MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static Result Failure(Exception exception) => new(Error.New(exception) ?? throw new ArgumentNullException(nameof(exception)));
|
||||
|
||||
[Pure, MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static Result<T> Failure<T>(string error) => Error.New(error ?? throw new ArgumentNullException(nameof(error)));
|
||||
|
||||
[Pure, MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public static Result<T> Failure<T>(Error error) => new(error ?? throw new ArgumentNullException(nameof(error)));
|
||||
|
||||
@@ -66,13 +78,13 @@ public readonly partial struct Result : IEquatable<Result>
|
||||
[Pure] public bool IsSuccess => Error is null;
|
||||
[Pure] public bool IsFailure => Error is not null;
|
||||
|
||||
[Pure] public bool Success([MaybeNullWhen(false)]out SuccessUnit? u, [MaybeNullWhen(true), NotNullWhen(false)]out Error? error)
|
||||
[Pure] public bool TryGetValue([MaybeNullWhen(false)]out SuccessUnit? u, [MaybeNullWhen(true), NotNullWhen(false)]out Error? error)
|
||||
{
|
||||
switch (State)
|
||||
{
|
||||
case ResultState.Success:
|
||||
u = new SuccessUnit();
|
||||
error = default;
|
||||
error = null;
|
||||
return true;
|
||||
|
||||
case ResultState.Error:
|
||||
@@ -161,13 +173,13 @@ public readonly struct Result<T> : IEquatable<Result<T>>
|
||||
[Pure] public bool IsSuccess => State == ResultState.Success;
|
||||
[Pure] public bool IsFailure => State == ResultState.Error;
|
||||
|
||||
[Pure] public bool Success([MaybeNullWhen(false)]out T value, [MaybeNullWhen(true), NotNullWhen(false)]out Error? error)
|
||||
[Pure] public bool TryGetValue([MaybeNullWhen(false)]out T value, [MaybeNullWhen(true), NotNullWhen(false)]out Error? error)
|
||||
{
|
||||
switch (State)
|
||||
{
|
||||
case ResultState.Success:
|
||||
value = Value;
|
||||
error = default;
|
||||
error = null;
|
||||
return true;
|
||||
|
||||
case ResultState.Error:
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
using System.Collections.Immutable;
|
||||
|
||||
namespace Just.Railway;
|
||||
|
||||
public static partial class ResultExtensions
|
||||
@@ -80,7 +82,7 @@ public static partial class ResultExtensions
|
||||
|
||||
public static Result Merge(this IEnumerable<Result> results)
|
||||
{
|
||||
List<Error>? errors = null;
|
||||
ImmutableArray<Error>.Builder? errors = null;
|
||||
bool hasErrors = false;
|
||||
|
||||
foreach (var result in results.OrderBy(x => x.State))
|
||||
@@ -89,8 +91,8 @@ public static partial class ResultExtensions
|
||||
{
|
||||
case ResultState.Error:
|
||||
hasErrors = true;
|
||||
errors ??= new(4);
|
||||
errors.Add(result.Error!);
|
||||
errors ??= ImmutableArray.CreateBuilder<Error>();
|
||||
ManyErrors.AppendSanitized(errors, result.Error!);
|
||||
break;
|
||||
|
||||
case ResultState.Success:
|
||||
@@ -102,7 +104,7 @@ public static partial class ResultExtensions
|
||||
}
|
||||
afterLoop:
|
||||
return hasErrors
|
||||
? new(new ManyErrors(errors!))
|
||||
? new(new ManyErrors(errors!.ToImmutable()))
|
||||
: new(null);
|
||||
}
|
||||
public static async Task<Result> Merge(this IEnumerable<Task<Result>> tasks)
|
||||
@@ -113,8 +115,8 @@ public static partial class ResultExtensions
|
||||
|
||||
public static Result<IEnumerable<T>> Merge<T>(this IEnumerable<Result<T>> results)
|
||||
{
|
||||
List<T>? values = null;
|
||||
List<Error>? errors = null;
|
||||
ImmutableList<T>.Builder? values = null;
|
||||
ImmutableArray<Error>.Builder? errors = null;
|
||||
bool hasErrors = false;
|
||||
|
||||
foreach (var result in results.OrderBy(x => x.State))
|
||||
@@ -123,13 +125,13 @@ public static partial class ResultExtensions
|
||||
{
|
||||
case ResultState.Error:
|
||||
hasErrors = true;
|
||||
errors ??= new(4);
|
||||
errors.Add(result.Error!);
|
||||
errors ??= ImmutableArray.CreateBuilder<Error>();
|
||||
ManyErrors.AppendSanitized(errors, result.Error!);
|
||||
break;
|
||||
|
||||
case ResultState.Success:
|
||||
if (hasErrors) goto afterLoop;
|
||||
values ??= new(4);
|
||||
values ??= ImmutableList.CreateBuilder<T>();
|
||||
values.Add(result.Value);
|
||||
break;
|
||||
|
||||
@@ -138,8 +140,8 @@ public static partial class ResultExtensions
|
||||
}
|
||||
afterLoop:
|
||||
return hasErrors
|
||||
? new(new ManyErrors(errors!))
|
||||
: new((IEnumerable<T>?)values ?? Array.Empty<T>());
|
||||
? new(new ManyErrors(errors!.ToImmutable()))
|
||||
: new(values is not null ? values.ToImmutable() : ImmutableList<T>.Empty);
|
||||
}
|
||||
public static async Task<Result<IEnumerable<T>>> Merge<T>(this IEnumerable<Task<Result<T>>> tasks)
|
||||
{
|
||||
|
||||
@@ -1,23 +1,20 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<OutputType>Exe</OutputType>
|
||||
|
||||
<AssemblyName>Just.Railway.Tests</AssemblyName>
|
||||
|
||||
<IsPackable>false</IsPackable>
|
||||
<IsTestProject>true</IsTestProject>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
|
||||
<PackageReference Include="xunit" Version="2.6.1" />
|
||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="coverlet.collector" Version="6.0.0">
|
||||
<PackageReference Include="xunit.v3" Version="3.2.0" />
|
||||
<PackageReference Include="coverlet.collector" Version="6.0.4">
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
</PackageReference>
|
||||
|
||||
@@ -169,4 +169,47 @@ public class GeneralUsage
|
||||
Assert.True(result.IsFailure);
|
||||
Assert.Equal(error, result.Error);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void WhenExtendingSuccessWithSuccess_ShouldReturnSuccess()
|
||||
{
|
||||
var success = Result.Success(1)
|
||||
.Append("2");
|
||||
|
||||
var result = success
|
||||
.Extend((i, s) => Result.Success($"{i} + {s}"));
|
||||
|
||||
Assert.True(result.IsSuccess);
|
||||
Assert.Equal((1, "2", "1 + 2"), result.Value);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void WhenExtendingFailureWithSuccess_ShouldNotEvaluateExtension()
|
||||
{
|
||||
var failure = Result.Success(1)
|
||||
.Append(Result.Failure<string>("failure"));
|
||||
|
||||
var result = failure
|
||||
.Extend((i, s) =>
|
||||
{
|
||||
Assert.Fail();
|
||||
return Result.Success("");
|
||||
});
|
||||
|
||||
Assert.True(result.IsFailure);
|
||||
Assert.Equal(Error.New("failure"), result.Error);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void WhenExtendingSuccessWithFailure_ShouldReturnFailure()
|
||||
{
|
||||
var success = Result.Success(1)
|
||||
.Append("2");
|
||||
|
||||
var result = success
|
||||
.Extend((i, s) => Result.Failure<string>("failure"));
|
||||
|
||||
Assert.True(result.IsFailure);
|
||||
Assert.Equal(Error.New("failure"), result.Error);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user