Skip to content

Commit 198d17a

Browse files
fix(client): better type names
1 parent 136affb commit 198d17a

File tree

8 files changed

+100
-92
lines changed

8 files changed

+100
-92
lines changed

src/Scrapegraphai/Models/Markdownify/MarkdownifyRetrieveStatusResponse.cs

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,15 @@ public abstract record class MarkdownifyRetrieveStatusResponse
1414
internal MarkdownifyRetrieveStatusResponse() { }
1515

1616
public static implicit operator MarkdownifyRetrieveStatusResponse(CompletedMarkdownify value) =>
17-
new MarkdownifyRetrieveStatusResponseVariants::CompletedMarkdownifyVariant(value);
17+
new MarkdownifyRetrieveStatusResponseVariants::CompletedMarkdownify(value);
1818

1919
public static implicit operator MarkdownifyRetrieveStatusResponse(
2020
FailedMarkdownifyResponse value
2121
) => new MarkdownifyRetrieveStatusResponseVariants::FailedMarkdownifyResponse(value);
2222

23-
public bool TryPickCompletedMarkdownifyVariant(
24-
[NotNullWhen(true)] out CompletedMarkdownify? value
25-
)
23+
public bool TryPickCompletedMarkdownify([NotNullWhen(true)] out CompletedMarkdownify? value)
2624
{
27-
value = (
28-
this as MarkdownifyRetrieveStatusResponseVariants::CompletedMarkdownifyVariant
29-
)?.Value;
25+
value = (this as MarkdownifyRetrieveStatusResponseVariants::CompletedMarkdownify)?.Value;
3026
return value != null;
3127
}
3228

@@ -41,13 +37,13 @@ public bool TryPickFailedMarkdownifyResponse(
4137
}
4238

4339
public void Switch(
44-
Action<MarkdownifyRetrieveStatusResponseVariants::CompletedMarkdownifyVariant> completedMarkdownify,
40+
Action<MarkdownifyRetrieveStatusResponseVariants::CompletedMarkdownify> completedMarkdownify,
4541
Action<MarkdownifyRetrieveStatusResponseVariants::FailedMarkdownifyResponse> failedMarkdownifyResponse
4642
)
4743
{
4844
switch (this)
4945
{
50-
case MarkdownifyRetrieveStatusResponseVariants::CompletedMarkdownifyVariant inner:
46+
case MarkdownifyRetrieveStatusResponseVariants::CompletedMarkdownify inner:
5147
completedMarkdownify(inner);
5248
break;
5349
case MarkdownifyRetrieveStatusResponseVariants::FailedMarkdownifyResponse inner:
@@ -60,7 +56,7 @@ public void Switch(
6056

6157
public T Match<T>(
6258
Func<
63-
MarkdownifyRetrieveStatusResponseVariants::CompletedMarkdownifyVariant,
59+
MarkdownifyRetrieveStatusResponseVariants::CompletedMarkdownify,
6460
T
6561
> completedMarkdownify,
6662
Func<
@@ -71,7 +67,7 @@ public T Match<T>(
7167
{
7268
return this switch
7369
{
74-
MarkdownifyRetrieveStatusResponseVariants::CompletedMarkdownifyVariant inner =>
70+
MarkdownifyRetrieveStatusResponseVariants::CompletedMarkdownify inner =>
7571
completedMarkdownify(inner),
7672
MarkdownifyRetrieveStatusResponseVariants::FailedMarkdownifyResponse inner =>
7773
failedMarkdownifyResponse(inner),
@@ -101,7 +97,7 @@ JsonSerializerOptions options
10197
);
10298
if (deserialized != null)
10399
{
104-
return new MarkdownifyRetrieveStatusResponseVariants::CompletedMarkdownifyVariant(
100+
return new MarkdownifyRetrieveStatusResponseVariants::CompletedMarkdownify(
105101
deserialized
106102
);
107103
}
@@ -140,7 +136,7 @@ JsonSerializerOptions options
140136
{
141137
object variant = value switch
142138
{
143-
MarkdownifyRetrieveStatusResponseVariants::CompletedMarkdownifyVariant(
139+
MarkdownifyRetrieveStatusResponseVariants::CompletedMarkdownify(
144140
var completedMarkdownify
145141
) => completedMarkdownify,
146142
MarkdownifyRetrieveStatusResponseVariants::FailedMarkdownifyResponse(

src/Scrapegraphai/Models/Markdownify/MarkdownifyRetrieveStatusResponseVariants/All.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1+
using Markdownify = Scrapegraphai.Models.Markdownify;
12
using MarkdownifyRetrieveStatusResponseProperties = Scrapegraphai.Models.Markdownify.MarkdownifyRetrieveStatusResponseProperties;
23

34
namespace Scrapegraphai.Models.Markdownify.MarkdownifyRetrieveStatusResponseVariants;
45

5-
public sealed record class CompletedMarkdownifyVariant(CompletedMarkdownify Value)
6-
: MarkdownifyRetrieveStatusResponse,
7-
IVariant<CompletedMarkdownifyVariant, CompletedMarkdownify>
6+
public sealed record class CompletedMarkdownify(Markdownify::CompletedMarkdownify Value)
7+
: Markdownify::MarkdownifyRetrieveStatusResponse,
8+
IVariant<CompletedMarkdownify, Markdownify::CompletedMarkdownify>
89
{
9-
public static CompletedMarkdownifyVariant From(CompletedMarkdownify value)
10+
public static CompletedMarkdownify From(Markdownify::CompletedMarkdownify value)
1011
{
1112
return new(value);
1213
}
@@ -20,7 +21,7 @@ public override void Validate()
2021
public sealed record class FailedMarkdownifyResponse(
2122
MarkdownifyRetrieveStatusResponseProperties::FailedMarkdownifyResponse Value
2223
)
23-
: MarkdownifyRetrieveStatusResponse,
24+
: Markdownify::MarkdownifyRetrieveStatusResponse,
2425
IVariant<
2526
FailedMarkdownifyResponse,
2627
MarkdownifyRetrieveStatusResponseProperties::FailedMarkdownifyResponse

src/Scrapegraphai/Models/Searchscraper/SearchscraperRetrieveStatusResponse.cs

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,16 @@ internal SearchscraperRetrieveStatusResponse() { }
1515

1616
public static implicit operator SearchscraperRetrieveStatusResponse(
1717
CompletedSearchScraper value
18-
) => new SearchscraperRetrieveStatusResponseVariants::CompletedSearchScraperVariant(value);
18+
) => new SearchscraperRetrieveStatusResponseVariants::CompletedSearchScraper(value);
1919

2020
public static implicit operator SearchscraperRetrieveStatusResponse(
2121
FailedSearchScraperResponse value
2222
) => new SearchscraperRetrieveStatusResponseVariants::FailedSearchScraperResponse(value);
2323

24-
public bool TryPickCompletedSearchScraperVariant(
25-
[NotNullWhen(true)] out CompletedSearchScraper? value
26-
)
24+
public bool TryPickCompletedSearchScraper([NotNullWhen(true)] out CompletedSearchScraper? value)
2725
{
2826
value = (
29-
this as SearchscraperRetrieveStatusResponseVariants::CompletedSearchScraperVariant
27+
this as SearchscraperRetrieveStatusResponseVariants::CompletedSearchScraper
3028
)?.Value;
3129
return value != null;
3230
}
@@ -42,13 +40,13 @@ public bool TryPickFailedSearchScraperResponse(
4240
}
4341

4442
public void Switch(
45-
Action<SearchscraperRetrieveStatusResponseVariants::CompletedSearchScraperVariant> completedSearchScraper,
43+
Action<SearchscraperRetrieveStatusResponseVariants::CompletedSearchScraper> completedSearchScraper,
4644
Action<SearchscraperRetrieveStatusResponseVariants::FailedSearchScraperResponse> failedSearchScraperResponse
4745
)
4846
{
4947
switch (this)
5048
{
51-
case SearchscraperRetrieveStatusResponseVariants::CompletedSearchScraperVariant inner:
49+
case SearchscraperRetrieveStatusResponseVariants::CompletedSearchScraper inner:
5250
completedSearchScraper(inner);
5351
break;
5452
case SearchscraperRetrieveStatusResponseVariants::FailedSearchScraperResponse inner:
@@ -61,7 +59,7 @@ public void Switch(
6159

6260
public T Match<T>(
6361
Func<
64-
SearchscraperRetrieveStatusResponseVariants::CompletedSearchScraperVariant,
62+
SearchscraperRetrieveStatusResponseVariants::CompletedSearchScraper,
6563
T
6664
> completedSearchScraper,
6765
Func<
@@ -72,7 +70,7 @@ public T Match<T>(
7270
{
7371
return this switch
7472
{
75-
SearchscraperRetrieveStatusResponseVariants::CompletedSearchScraperVariant inner =>
73+
SearchscraperRetrieveStatusResponseVariants::CompletedSearchScraper inner =>
7674
completedSearchScraper(inner),
7775
SearchscraperRetrieveStatusResponseVariants::FailedSearchScraperResponse inner =>
7876
failedSearchScraperResponse(inner),
@@ -102,7 +100,7 @@ JsonSerializerOptions options
102100
);
103101
if (deserialized != null)
104102
{
105-
return new SearchscraperRetrieveStatusResponseVariants::CompletedSearchScraperVariant(
103+
return new SearchscraperRetrieveStatusResponseVariants::CompletedSearchScraper(
106104
deserialized
107105
);
108106
}
@@ -141,7 +139,7 @@ JsonSerializerOptions options
141139
{
142140
object variant = value switch
143141
{
144-
SearchscraperRetrieveStatusResponseVariants::CompletedSearchScraperVariant(
142+
SearchscraperRetrieveStatusResponseVariants::CompletedSearchScraper(
145143
var completedSearchScraper
146144
) => completedSearchScraper,
147145
SearchscraperRetrieveStatusResponseVariants::FailedSearchScraperResponse(

src/Scrapegraphai/Models/Searchscraper/SearchscraperRetrieveStatusResponseVariants/All.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1+
using Searchscraper = Scrapegraphai.Models.Searchscraper;
12
using SearchscraperRetrieveStatusResponseProperties = Scrapegraphai.Models.Searchscraper.SearchscraperRetrieveStatusResponseProperties;
23

34
namespace Scrapegraphai.Models.Searchscraper.SearchscraperRetrieveStatusResponseVariants;
45

5-
public sealed record class CompletedSearchScraperVariant(CompletedSearchScraper Value)
6-
: SearchscraperRetrieveStatusResponse,
7-
IVariant<CompletedSearchScraperVariant, CompletedSearchScraper>
6+
public sealed record class CompletedSearchScraper(Searchscraper::CompletedSearchScraper Value)
7+
: Searchscraper::SearchscraperRetrieveStatusResponse,
8+
IVariant<CompletedSearchScraper, Searchscraper::CompletedSearchScraper>
89
{
9-
public static CompletedSearchScraperVariant From(CompletedSearchScraper value)
10+
public static CompletedSearchScraper From(Searchscraper::CompletedSearchScraper value)
1011
{
1112
return new(value);
1213
}
@@ -20,7 +21,7 @@ public override void Validate()
2021
public sealed record class FailedSearchScraperResponse(
2122
SearchscraperRetrieveStatusResponseProperties::FailedSearchScraperResponse Value
2223
)
23-
: SearchscraperRetrieveStatusResponse,
24+
: Searchscraper::SearchscraperRetrieveStatusResponse,
2425
IVariant<
2526
FailedSearchScraperResponse,
2627
SearchscraperRetrieveStatusResponseProperties::FailedSearchScraperResponse

src/Scrapegraphai/Models/Smartscraper/SmartscraperListResponse.cs

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Diagnostics.CodeAnalysis;
44
using System.Text.Json;
55
using System.Text.Json.Serialization;
6-
using Scrapegraphai.Models.Smartscraper.SmartscraperListResponseVariants;
6+
using SmartscraperListResponseVariants = Scrapegraphai.Models.Smartscraper.SmartscraperListResponseVariants;
77

88
namespace Scrapegraphai.Models.Smartscraper;
99

@@ -13,36 +13,34 @@ public abstract record class SmartscraperListResponse
1313
internal SmartscraperListResponse() { }
1414

1515
public static implicit operator SmartscraperListResponse(CompletedSmartscraper value) =>
16-
new CompletedSmartscraperVariant(value);
16+
new SmartscraperListResponseVariants::CompletedSmartscraper(value);
1717

1818
public static implicit operator SmartscraperListResponse(FailedSmartscraper value) =>
19-
new FailedSmartscraperVariant(value);
19+
new SmartscraperListResponseVariants::FailedSmartscraper(value);
2020

21-
public bool TryPickCompletedSmartscraperVariant(
22-
[NotNullWhen(true)] out CompletedSmartscraper? value
23-
)
21+
public bool TryPickCompletedSmartscraper([NotNullWhen(true)] out CompletedSmartscraper? value)
2422
{
25-
value = (this as CompletedSmartscraperVariant)?.Value;
23+
value = (this as SmartscraperListResponseVariants::CompletedSmartscraper)?.Value;
2624
return value != null;
2725
}
2826

29-
public bool TryPickFailedSmartscraperVariant([NotNullWhen(true)] out FailedSmartscraper? value)
27+
public bool TryPickFailedSmartscraper([NotNullWhen(true)] out FailedSmartscraper? value)
3028
{
31-
value = (this as FailedSmartscraperVariant)?.Value;
29+
value = (this as SmartscraperListResponseVariants::FailedSmartscraper)?.Value;
3230
return value != null;
3331
}
3432

3533
public void Switch(
36-
Action<CompletedSmartscraperVariant> completedSmartscraper,
37-
Action<FailedSmartscraperVariant> failedSmartscraper
34+
Action<SmartscraperListResponseVariants::CompletedSmartscraper> completedSmartscraper,
35+
Action<SmartscraperListResponseVariants::FailedSmartscraper> failedSmartscraper
3836
)
3937
{
4038
switch (this)
4139
{
42-
case CompletedSmartscraperVariant inner:
40+
case SmartscraperListResponseVariants::CompletedSmartscraper inner:
4341
completedSmartscraper(inner);
4442
break;
45-
case FailedSmartscraperVariant inner:
43+
case SmartscraperListResponseVariants::FailedSmartscraper inner:
4644
failedSmartscraper(inner);
4745
break;
4846
default:
@@ -51,14 +49,16 @@ Action<FailedSmartscraperVariant> failedSmartscraper
5149
}
5250

5351
public T Match<T>(
54-
Func<CompletedSmartscraperVariant, T> completedSmartscraper,
55-
Func<FailedSmartscraperVariant, T> failedSmartscraper
52+
Func<SmartscraperListResponseVariants::CompletedSmartscraper, T> completedSmartscraper,
53+
Func<SmartscraperListResponseVariants::FailedSmartscraper, T> failedSmartscraper
5654
)
5755
{
5856
return this switch
5957
{
60-
CompletedSmartscraperVariant inner => completedSmartscraper(inner),
61-
FailedSmartscraperVariant inner => failedSmartscraper(inner),
58+
SmartscraperListResponseVariants::CompletedSmartscraper inner => completedSmartscraper(
59+
inner
60+
),
61+
SmartscraperListResponseVariants::FailedSmartscraper inner => failedSmartscraper(inner),
6262
_ => throw new InvalidOperationException(),
6363
};
6464
}
@@ -84,7 +84,7 @@ JsonSerializerOptions options
8484
);
8585
if (deserialized != null)
8686
{
87-
return new CompletedSmartscraperVariant(deserialized);
87+
return new SmartscraperListResponseVariants::CompletedSmartscraper(deserialized);
8888
}
8989
}
9090
catch (JsonException e)
@@ -97,7 +97,7 @@ JsonSerializerOptions options
9797
var deserialized = JsonSerializer.Deserialize<FailedSmartscraper>(ref reader, options);
9898
if (deserialized != null)
9999
{
100-
return new FailedSmartscraperVariant(deserialized);
100+
return new SmartscraperListResponseVariants::FailedSmartscraper(deserialized);
101101
}
102102
}
103103
catch (JsonException e)
@@ -116,8 +116,10 @@ JsonSerializerOptions options
116116
{
117117
object variant = value switch
118118
{
119-
CompletedSmartscraperVariant(var completedSmartscraper) => completedSmartscraper,
120-
FailedSmartscraperVariant(var failedSmartscraper) => failedSmartscraper,
119+
SmartscraperListResponseVariants::CompletedSmartscraper(var completedSmartscraper) =>
120+
completedSmartscraper,
121+
SmartscraperListResponseVariants::FailedSmartscraper(var failedSmartscraper) =>
122+
failedSmartscraper,
121123
_ => throw new ArgumentOutOfRangeException(nameof(value)),
122124
};
123125
JsonSerializer.Serialize(writer, variant, options);

src/Scrapegraphai/Models/Smartscraper/SmartscraperListResponseVariants/All.cs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
using Smartscraper = Scrapegraphai.Models.Smartscraper;
2+
13
namespace Scrapegraphai.Models.Smartscraper.SmartscraperListResponseVariants;
24

3-
public sealed record class CompletedSmartscraperVariant(CompletedSmartscraper Value)
4-
: SmartscraperListResponse,
5-
IVariant<CompletedSmartscraperVariant, CompletedSmartscraper>
5+
public sealed record class CompletedSmartscraper(Smartscraper::CompletedSmartscraper Value)
6+
: Smartscraper::SmartscraperListResponse,
7+
IVariant<CompletedSmartscraper, Smartscraper::CompletedSmartscraper>
68
{
7-
public static CompletedSmartscraperVariant From(CompletedSmartscraper value)
9+
public static CompletedSmartscraper From(Smartscraper::CompletedSmartscraper value)
810
{
911
return new(value);
1012
}
@@ -15,11 +17,11 @@ public override void Validate()
1517
}
1618
}
1719

18-
public sealed record class FailedSmartscraperVariant(FailedSmartscraper Value)
19-
: SmartscraperListResponse,
20-
IVariant<FailedSmartscraperVariant, FailedSmartscraper>
20+
public sealed record class FailedSmartscraper(Smartscraper::FailedSmartscraper Value)
21+
: Smartscraper::SmartscraperListResponse,
22+
IVariant<FailedSmartscraper, Smartscraper::FailedSmartscraper>
2123
{
22-
public static FailedSmartscraperVariant From(FailedSmartscraper value)
24+
public static FailedSmartscraper From(Smartscraper::FailedSmartscraper value)
2325
{
2426
return new(value);
2527
}

0 commit comments

Comments
 (0)