Skip to content

Commit 36c9f64

Browse files
authored
chore(ast): Update linter/style preferences (#405)
- Ensures `celest_lints` is used - Applies latest linter/style preferences using dart fix - Re-formats using Dart 3.8
1 parent 7099f3d commit 36c9f64

16 files changed

+5297
-2866
lines changed

.github/workflows/celest_ast.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
- name: Setup Flutter
2424
uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # 2.19.0
2525
with:
26+
channel: beta
2627
cache: true
2728
- name: Get Packages
2829
working-directory: packages/celest_ast
@@ -32,4 +33,4 @@ jobs:
3233
run: dart analyze --fatal-infos --fatal-warnings .
3334
- name: Format
3435
working-directory: packages/celest_ast
35-
run: dart format --set-exit-if-changed .
36+
run: dart format --language-version=latest --set-exit-if-changed .

packages/celest_ast/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## NEXT
2+
3+
- chore: Re-format with Dart 3.8
4+
- chore: Update linter/style preferences
5+
16
## 0.1.6
27

38
- chore: Add `version` field to `DatabaseSchema`
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
include: package:lints/recommended.yaml
1+
include: package:celest_lints/library.yaml
22

33
analyzer:
44
errors:
55
implementation_imports: ignore
6+
public_member_api_docs: ignore
67
exclude:
78
- '**/*.pb.dart'
9+
- '**/*.pbenum.dart'
10+
- '**/*.pbjson.dart'

packages/celest_ast/lib/src/ast.dart

Lines changed: 64 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@ sealed class AstNode {
1616
}
1717

1818
class Region extends EnumClass {
19+
const Region._(super.name);
1920
static const Region northAmerica = _$northAmerica;
2021
static const Region europe = _$europe;
2122
static const Region asiaPacific = _$asiaPacific;
2223

23-
const Region._(super.name);
24-
2524
static BuiltSet<Region> get values => _$RegionValues;
2625
static Region valueOf(String name) => _$RegionValueOf(name);
2726

@@ -150,9 +149,7 @@ sealed class ApiAuth implements ApiMetadata {}
150149

151150
abstract class ApiPublic
152151
implements Built<ApiPublic, ApiPublicBuilder>, ApiAuth {
153-
factory ApiPublic({
154-
required FileSpan location,
155-
}) = _$ApiPublic._;
152+
factory ApiPublic({required FileSpan location}) = _$ApiPublic._;
156153

157154
factory ApiPublic.build([void Function(ApiPublicBuilder) updates]) =
158155
_$ApiPublic;
@@ -178,9 +175,7 @@ abstract class ApiPublic
178175

179176
abstract class ApiAuthenticated
180177
implements Built<ApiAuthenticated, ApiAuthenticatedBuilder>, ApiAuth {
181-
factory ApiAuthenticated({
182-
required FileSpan location,
183-
}) = _$ApiAuthenticated._;
178+
factory ApiAuthenticated({required FileSpan location}) = _$ApiAuthenticated._;
184179

185180
factory ApiAuthenticated.build([
186181
void Function(ApiAuthenticatedBuilder) updates,
@@ -208,14 +203,11 @@ abstract class ApiAuthenticated
208203

209204
abstract class ApiMiddleware
210205
implements Built<ApiMiddleware, ApiMiddlewareBuilder>, ApiMetadata {
211-
factory ApiMiddleware({
212-
required Reference type,
213-
required FileSpan location,
214-
}) = _$ApiMiddleware._;
206+
factory ApiMiddleware({required Reference type, required FileSpan location}) =
207+
_$ApiMiddleware._;
215208

216-
factory ApiMiddleware.build([
217-
void Function(ApiMiddlewareBuilder) updates,
218-
]) = _$ApiMiddleware;
209+
factory ApiMiddleware.build([void Function(ApiMiddlewareBuilder) updates]) =
210+
_$ApiMiddleware;
219211

220212
ApiMiddleware._();
221213

@@ -459,7 +451,7 @@ abstract class CloudFunction
459451

460452
@override
461453
int compareTo(CloudFunction other) {
462-
final apiCompare = apiName.compareTo(other.apiName);
454+
final int apiCompare = apiName.compareTo(other.apiName);
463455
if (apiCompare != 0) {
464456
return apiCompare;
465457
}
@@ -511,14 +503,13 @@ abstract class Variable
511503
String? value,
512504
Iterable<String> docs = const [],
513505
required FileSpan location,
514-
}) =>
515-
_$Variable._(
516-
name: name,
517-
dartName: dartName,
518-
value: value,
519-
docs: docs.toBuiltList(),
520-
location: location,
521-
);
506+
}) => _$Variable._(
507+
name: name,
508+
dartName: dartName,
509+
value: value,
510+
docs: docs.toBuiltList(),
511+
location: location,
512+
);
522513

523514
Variable._();
524515

@@ -552,13 +543,12 @@ abstract class Secret
552543
String? dartName,
553544
Iterable<String> docs = const [],
554545
required FileSpan location,
555-
}) =>
556-
_$Secret._(
557-
name: name,
558-
dartName: dartName,
559-
docs: docs.toBuiltList(),
560-
location: location,
561-
);
546+
}) => _$Secret._(
547+
name: name,
548+
dartName: dartName,
549+
docs: docs.toBuiltList(),
550+
location: location,
551+
);
562552

563553
Secret._();
564554

@@ -614,6 +604,8 @@ abstract class Auth implements Built<Auth, AuthBuilder>, AstNode {
614604
}
615605

616606
class AuthProviderType extends EnumClass {
607+
const AuthProviderType._(super.name);
608+
617609
@BuiltValueEnumConst(wireName: 'EMAIL_OTP')
618610
static const AuthProviderType emailOtp = _$emailOtp;
619611

@@ -635,8 +627,6 @@ class AuthProviderType extends EnumClass {
635627
@BuiltValueEnumConst(wireName: 'SUPABASE')
636628
static const AuthProviderType supabase = _$supabase;
637629

638-
const AuthProviderType._(super.name);
639-
640630
static BuiltSet<AuthProviderType> get values => _$AuthProviderTypeValues;
641631
static AuthProviderType valueOf(String name) =>
642632
_$AuthProviderTypeValueOf(name);
@@ -659,9 +649,7 @@ sealed class AuthProvider implements AstNode {
659649
String get name;
660650
AuthProviderType get type;
661651

662-
AuthProvider rebuild(
663-
void Function(AuthProviderBuilder) updates,
664-
);
652+
AuthProvider rebuild(void Function(AuthProviderBuilder) updates);
665653
AuthProviderBuilder toBuilder();
666654
}
667655

@@ -705,18 +693,16 @@ abstract class EmailAuthProvider
705693
implements
706694
AuthProvider,
707695
Built<EmailAuthProvider, EmailAuthProviderBuilder> {
708-
factory EmailAuthProvider({
709-
String? name,
710-
required FileSpan location,
711-
}) {
696+
factory EmailAuthProvider({String? name, required FileSpan location}) {
712697
return _$EmailAuthProvider._(
713698
name: name ?? $type.name,
714699
type: $type,
715700
location: location,
716701
);
717702
}
718-
factory EmailAuthProvider.build(
719-
[void Function(EmailAuthProviderBuilder) updates]) = _$EmailAuthProvider;
703+
factory EmailAuthProvider.build([
704+
void Function(EmailAuthProviderBuilder) updates,
705+
]) = _$EmailAuthProvider;
720706
EmailAuthProvider._();
721707

722708
@BuiltValueHook(finalizeBuilder: true)
@@ -740,19 +726,17 @@ abstract class EmailAuthProvider
740726

741727
abstract class SmsAuthProvider
742728
implements AuthProvider, Built<SmsAuthProvider, SmsAuthProviderBuilder> {
743-
factory SmsAuthProvider({
744-
String? name,
745-
required FileSpan location,
746-
}) {
729+
factory SmsAuthProvider({String? name, required FileSpan location}) {
747730
return _$SmsAuthProvider._(
748731
name: name ?? $type.name,
749732
type: $type,
750733
location: location,
751734
);
752735
}
753736

754-
factory SmsAuthProvider.build(
755-
[void Function(SmsAuthProviderBuilder) updates]) = _$SmsAuthProvider;
737+
factory SmsAuthProvider.build([
738+
void Function(SmsAuthProviderBuilder) updates,
739+
]) = _$SmsAuthProvider;
756740
SmsAuthProvider._();
757741

758742
@BuiltValueHook(finalizeBuilder: true)
@@ -793,9 +777,9 @@ abstract class GoogleAuthProvider
793777
);
794778
}
795779

796-
factory GoogleAuthProvider.build(
797-
[void Function(GoogleAuthProviderBuilder) updates]) =
798-
_$GoogleAuthProvider;
780+
factory GoogleAuthProvider.build([
781+
void Function(GoogleAuthProviderBuilder) updates,
782+
]) = _$GoogleAuthProvider;
799783
GoogleAuthProvider._();
800784

801785
@BuiltValueHook(finalizeBuilder: true)
@@ -843,8 +827,9 @@ abstract class AppleAuthProvider
843827
);
844828
}
845829

846-
factory AppleAuthProvider.build(
847-
[void Function(AppleAuthProviderBuilder) updates]) = _$AppleAuthProvider;
830+
factory AppleAuthProvider.build([
831+
void Function(AppleAuthProviderBuilder) updates,
832+
]) = _$AppleAuthProvider;
848833
AppleAuthProvider._();
849834

850835
@BuiltValueHook(finalizeBuilder: true)
@@ -890,9 +875,9 @@ abstract class GitHubAuthProvider
890875
);
891876
}
892877

893-
factory GitHubAuthProvider.build(
894-
[void Function(GitHubAuthProviderBuilder) updates]) =
895-
_$GitHubAuthProvider;
878+
factory GitHubAuthProvider.build([
879+
void Function(GitHubAuthProviderBuilder) updates,
880+
]) = _$GitHubAuthProvider;
896881
GitHubAuthProvider._();
897882

898883
@BuiltValueHook(finalizeBuilder: true)
@@ -920,8 +905,10 @@ abstract class GitHubAuthProvider
920905
abstract class FirebaseExternalAuthProvider
921906
implements
922907
ExternalAuthProvider,
923-
Built<FirebaseExternalAuthProvider,
924-
FirebaseExternalAuthProviderBuilder> {
908+
Built<
909+
FirebaseExternalAuthProvider,
910+
FirebaseExternalAuthProviderBuilder
911+
> {
925912
factory FirebaseExternalAuthProvider({
926913
String? name,
927914
required FileSpan location,
@@ -935,9 +922,9 @@ abstract class FirebaseExternalAuthProvider
935922
);
936923
}
937924

938-
factory FirebaseExternalAuthProvider.build(
939-
[void Function(FirebaseExternalAuthProviderBuilder) updates]) =
940-
_$FirebaseExternalAuthProvider;
925+
factory FirebaseExternalAuthProvider.build([
926+
void Function(FirebaseExternalAuthProviderBuilder) updates,
927+
]) = _$FirebaseExternalAuthProvider;
941928
FirebaseExternalAuthProvider._();
942929

943930
@BuiltValueHook(finalizeBuilder: true)
@@ -964,8 +951,10 @@ abstract class FirebaseExternalAuthProvider
964951
abstract class SupabaseExternalAuthProvider
965952
implements
966953
ExternalAuthProvider,
967-
Built<SupabaseExternalAuthProvider,
968-
SupabaseExternalAuthProviderBuilder> {
954+
Built<
955+
SupabaseExternalAuthProvider,
956+
SupabaseExternalAuthProviderBuilder
957+
> {
969958
factory SupabaseExternalAuthProvider({
970959
String? name,
971960
required FileSpan location,
@@ -981,9 +970,9 @@ abstract class SupabaseExternalAuthProvider
981970
);
982971
}
983972

984-
factory SupabaseExternalAuthProvider.build(
985-
[void Function(SupabaseExternalAuthProviderBuilder) updates]) =
986-
_$SupabaseExternalAuthProvider;
973+
factory SupabaseExternalAuthProvider.build([
974+
void Function(SupabaseExternalAuthProviderBuilder) updates,
975+
]) = _$SupabaseExternalAuthProvider;
987976
SupabaseExternalAuthProvider._();
988977

989978
@BuiltValueHook(finalizeBuilder: true)
@@ -1033,14 +1022,8 @@ class NodeType extends EnumClass {
10331022

10341023
abstract class NodeReference
10351024
implements Built<NodeReference, NodeReferenceBuilder> {
1036-
factory NodeReference({
1037-
required String name,
1038-
required NodeType type,
1039-
}) {
1040-
return _$NodeReference._(
1041-
name: name,
1042-
type: type,
1043-
);
1025+
factory NodeReference({required String name, required NodeType type}) {
1026+
return _$NodeReference._(name: name, type: type);
10441027
}
10451028

10461029
factory NodeReference.build([void Function(NodeReferenceBuilder) updates]) =
@@ -1101,9 +1084,9 @@ abstract class DriftDatabaseSchema
11011084
);
11021085
}
11031086

1104-
factory DriftDatabaseSchema.build(
1105-
[void Function(DriftDatabaseSchemaBuilder) updates]) =
1106-
_$DriftDatabaseSchema;
1087+
factory DriftDatabaseSchema.build([
1088+
void Function(DriftDatabaseSchemaBuilder) updates,
1089+
]) = _$DriftDatabaseSchema;
11071090

11081091
DriftDatabaseSchema._();
11091092

@@ -1212,15 +1195,12 @@ abstract class CelestDatabaseConfig
12121195
required Variable hostname,
12131196
required Secret token,
12141197
}) {
1215-
return _$CelestDatabaseConfig._(
1216-
hostname: hostname,
1217-
token: token,
1218-
);
1198+
return _$CelestDatabaseConfig._(hostname: hostname, token: token);
12191199
}
12201200

1221-
factory CelestDatabaseConfig.build(
1222-
[void Function(CelestDatabaseConfigBuilder) updates]) =
1223-
_$CelestDatabaseConfig;
1201+
factory CelestDatabaseConfig.build([
1202+
void Function(CelestDatabaseConfigBuilder) updates,
1203+
]) = _$CelestDatabaseConfig;
12241204

12251205
CelestDatabaseConfig._();
12261206

0 commit comments

Comments
 (0)