Skip to content

Commit c974568

Browse files
committed
Fix lint errors
1 parent 153688d commit c974568

File tree

5 files changed

+51
-44
lines changed

5 files changed

+51
-44
lines changed

.github/workflows/celest_cli.e2e.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
os:
32-
- ubuntu-latest
32+
- ubuntu-large
3333
- macos-latest
34-
- windows-latest
34+
# - windows-latest
3535
runs-on: ${{ matrix.os }}
3636
timeout-minutes: 45
3737
steps:

.github/workflows/celest_cli.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
os:
3232
- ubuntu-large
3333
- macos-latest-xlarge
34-
- windows-large
34+
# - windows-large
3535
runs-on: ${{ matrix.os }}
3636
timeout-minutes: 45
3737
steps:

packages/celest_cloud/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# NEXT
2+
3+
- chore: Fix lint errors
4+
15
# 0.1.9
26

37
- chore: Bump Dart SDK constraint to `^3.7.0`

packages/celest_cloud/lib/src/cloud/base/base_service.dart

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,24 @@ abstract mixin class BaseService {
3737
}
3838

3939
@protected
40-
Stream<OperationState<Metadata, Response>> streamOperation<
41-
Metadata extends GeneratedMessage,
42-
Response extends GeneratedMessage
40+
Stream<OperationState<TMetadata, TResponse>> streamOperation<
41+
TMetadata extends GeneratedMessage,
42+
TResponse extends GeneratedMessage
4343
>(
4444
String name, {
4545
required Operation operation,
4646
required OperationsProtocol operations,
47-
required Metadata metadata,
48-
required Response response,
47+
required TMetadata metadata,
48+
required TResponse response,
4949
Logger? logger,
5050
}) async* {
51-
final Stream<OperationState<Metadata, Response>> stream = operation.stream(
52-
operations: operations,
53-
metadata: metadata,
54-
response: response,
55-
logger: logger,
56-
);
51+
final Stream<OperationState<TMetadata, TResponse>> stream = operation
52+
.stream(
53+
operations: operations,
54+
metadata: metadata,
55+
response: response,
56+
logger: logger,
57+
);
5758
try {
5859
await for (final state in stream) {
5960
logger?.fine('[$name.${operation.name}] Operation state:\n$state');

packages/celest_cloud/lib/src/util/operations.dart

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -30,49 +30,51 @@ extension WaitForOperation on Operation {
3030
return operation.response.unpackInto(response);
3131
}
3232

33-
Stream<OperationState<Metadata, Response>>
34-
stream<Metadata extends GeneratedMessage, Response extends GeneratedMessage>({
33+
Stream<OperationState<TMetadata, TResponse>> stream<
34+
TMetadata extends GeneratedMessage,
35+
TResponse extends GeneratedMessage
36+
>({
3537
required OperationsProtocol operations,
36-
required Metadata metadata,
37-
required Response response,
38+
required TMetadata metadata,
39+
required TResponse response,
3840
Logger? logger,
3941
}) {
4042
if (done) {
4143
return Stream.value(
42-
state<Metadata, Response>(metadata: metadata, response: response),
44+
state<TMetadata, TResponse>(metadata: metadata, response: response),
4345
);
4446
}
4547
return OperationWaiter(
4648
this,
4749
protocol: operations,
4850
logger: logger,
4951
).stream.map((operation) {
50-
return operation.state<Metadata, Response>(
52+
return operation.state<TMetadata, TResponse>(
5153
metadata: metadata,
5254
response: response,
5355
);
5456
});
5557
}
5658

57-
OperationState<Metadata, Response> state<
58-
Metadata extends GeneratedMessage,
59-
Response extends GeneratedMessage
60-
>({required Metadata metadata, required Response response}) {
59+
OperationState<TMetadata, TResponse> state<
60+
TMetadata extends GeneratedMessage,
61+
TResponse extends GeneratedMessage
62+
>({required TMetadata metadata, required TResponse response}) {
6163
if (done) {
6264
if (hasError()) {
63-
return OperationFailure<Metadata, Response>(
65+
return OperationFailure<TMetadata, TResponse>(
6466
id: name,
6567
metadata: hasMetadata() ? metadata.unpack(this.metadata) : metadata,
6668
error: error.grpcError,
6769
);
6870
}
69-
return OperationSuccess<Metadata, Response>(
71+
return OperationSuccess<TMetadata, TResponse>(
7072
id: name,
7173
metadata: hasMetadata() ? metadata.unpack(this.metadata) : metadata,
7274
response: response.unpack(ensureResponse()),
7375
);
7476
}
75-
return OperationInProgress<Metadata, Response>(
77+
return OperationInProgress<TMetadata, TResponse>(
7678
id: name,
7779
metadata: hasMetadata() ? metadata.unpack(this.metadata) : metadata,
7880
);
@@ -92,24 +94,24 @@ extension<T extends GeneratedMessage> on T {
9294
}
9395

9496
sealed class OperationState<
95-
Metadata extends GeneratedMessage,
96-
Response extends GeneratedMessage
97+
TMetadata extends GeneratedMessage,
98+
TResponse extends GeneratedMessage
9799
> {
98100
OperationState({required this.id, required this.metadata});
99101

100102
final String id;
101-
final Metadata metadata;
103+
final TMetadata metadata;
102104

103105
bool get done => false;
104-
Response? get response => null;
106+
TResponse? get response => null;
105107
GrpcError? get error => null;
106108
}
107109

108110
final class OperationInProgress<
109-
Metadata extends GeneratedMessage,
110-
Response extends GeneratedMessage
111+
TMetadata extends GeneratedMessage,
112+
TResponse extends GeneratedMessage
111113
>
112-
extends OperationState<Metadata, Response> {
114+
extends OperationState<TMetadata, TResponse> {
113115
OperationInProgress({required super.id, required super.metadata});
114116

115117
@override
@@ -122,10 +124,10 @@ final class OperationInProgress<
122124
}
123125

124126
final class OperationSuccess<
125-
Metadata extends GeneratedMessage,
126-
Response extends GeneratedMessage
127+
TMetadata extends GeneratedMessage,
128+
TResponse extends GeneratedMessage
127129
>
128-
extends OperationState<Metadata, Response> {
130+
extends OperationState<TMetadata, TResponse> {
129131
OperationSuccess({
130132
required super.id,
131133
required super.metadata,
@@ -136,7 +138,7 @@ final class OperationSuccess<
136138
bool get done => true;
137139

138140
@override
139-
final Response response;
141+
final TResponse response;
140142

141143
@override
142144
String toString() {
@@ -149,10 +151,10 @@ final class OperationSuccess<
149151
}
150152

151153
final class OperationCancelled<
152-
Metadata extends GeneratedMessage,
153-
Response extends GeneratedMessage
154+
TMetadata extends GeneratedMessage,
155+
TResponse extends GeneratedMessage
154156
>
155-
extends OperationState<Metadata, Response> {
157+
extends OperationState<TMetadata, TResponse> {
156158
OperationCancelled({required super.id, required super.metadata});
157159

158160
@override
@@ -168,10 +170,10 @@ final class OperationCancelled<
168170
}
169171

170172
final class OperationFailure<
171-
Metadata extends GeneratedMessage,
172-
Response extends GeneratedMessage
173+
TMetadata extends GeneratedMessage,
174+
TResponse extends GeneratedMessage
173175
>
174-
extends OperationState<Metadata, Response> {
176+
extends OperationState<TMetadata, TResponse> {
175177
OperationFailure({
176178
required super.id,
177179
required super.metadata,

0 commit comments

Comments
 (0)