Skip to content

Commit ca7bd6b

Browse files
dcharkesdcharkes
authored
[native_assets_cli] Rename syntax classes to ${name}Syntax (#2240)
1 parent 40e0a3c commit ca7bd6b

24 files changed

+549
-510
lines changed

‎pkgs/json_syntax_generator/lib/src/generator/enum_class_generator.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class EnumGenerator {
1111

1212
String generate() {
1313
final buffer = StringBuffer();
14-
final className = classInfo.name;
14+
final className = classInfo.className;
1515
final enumValues = classInfo.enumValues;
1616

1717
final staticFinals = <String>[];

‎pkgs/json_syntax_generator/lib/src/generator/helper_library.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
///
77
/// This simplifies the code generator.
88
const helperLib = r'''
9-
class JsonObject {
9+
class JsonObjectSyntax {
1010
final Map<String, Object?> json;
1111
1212
final List<Object> path;
1313
1414
JsonReader get _reader => JsonReader(json, path);
1515
16-
JsonObject() : json = {}, path = const [];
16+
JsonObjectSyntax() : json = {}, path = const [];
1717
18-
JsonObject.fromJson(this.json, {this.path = const []});
18+
JsonObjectSyntax.fromJson(this.json, {this.path = const []});
1919
2020
List<String> validate() => [];
2121
}

‎pkgs/json_syntax_generator/lib/src/generator/normal_class_generator.dart

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ class ClassGenerator {
1919
}
2020

2121
void _generateClass(StringBuffer buffer) {
22-
final className = classInfo.name;
23-
final superclassName = classInfo.superclass?.name ?? 'JsonObject';
22+
final className = classInfo.className;
23+
final superclassName =
24+
classInfo.superclass?.className ?? 'JsonObjectSyntax';
2425

2526
buffer.writeln('''
2627
class $className extends $superclassName {
@@ -57,7 +58,7 @@ static const ${tagProperty}Value = '$tagValue';
5758
return '';
5859
}
5960

60-
final className = classInfo.name;
61+
final className = classInfo.className;
6162
final factorySubclassReturns = <String>[];
6263
for (final subclass in classInfo.subclasses) {
6364
if (subclass.taggedUnionValue != null) {
@@ -82,7 +83,7 @@ static const ${tagProperty}Value = '$tagValue';
8283
}
8384

8485
String _generateJsonConstructor() {
85-
final className = classInfo.name;
86+
final className = classInfo.className;
8687

8788
if (classInfo.superclass == null) {
8889
final constructorName =
@@ -107,7 +108,7 @@ static const ${tagProperty}Value = '$tagValue';
107108
final parameters = _generateDefaultConstructorParameters();
108109
final superArguments = _generateDefaultConstructorSuperArguments();
109110
final setterCalls = _generateSetterCalls();
110-
final className = classInfo.name;
111+
final className = classInfo.className;
111112
final parametersString = wrapBracesIfNotEmpty(parameters.join(', '));
112113
final superArgumentsString = superArguments.join(',');
113114
final body = wrapInBracesOrSemicolon(setterCalls.join('\n '));
@@ -231,8 +232,8 @@ static const ${tagProperty}Value = '$tagValue';
231232

232233
final parameters = _generateSetupParameters();
233234
final setterCalls = _generateSetterCalls();
234-
final className = classInfo.name;
235-
final superclassName = classInfo.superclass!.name;
235+
final className = classInfo.className;
236+
final superclassName = classInfo.superclass!.className;
236237
final parametersString = wrapBracesIfNotEmpty(parameters.join(', '));
237238
final setterCallsString = setterCalls.join('\n ');
238239
return '''
@@ -343,7 +344,7 @@ static const ${tagProperty}Value = '$tagValue';
343344
}
344345

345346
String _generateToString() {
346-
final className = classInfo.name;
347+
final className = classInfo.className;
347348
return '''
348349
@override
349350
String toString() => '$className(\$json)';
@@ -353,16 +354,17 @@ static const ${tagProperty}Value = '$tagValue';
353354
void _generateTaggedUnionExtension(StringBuffer buffer) {
354355
if (!classInfo.isTaggedUnion || classInfo.superclass == null) return;
355356

356-
final className = classInfo.name;
357-
final superclassName = classInfo.superclass!.name;
357+
final name = classInfo.name;
358+
final className = classInfo.className;
359+
final superclassName = classInfo.superclass!.className;
358360
final taggedUnionValue = classInfo.taggedUnionValue;
359361
final taggedUnionProperty = classInfo.superclass!.taggedUnionProperty;
360362

361363
buffer.writeln('''
362364
extension ${className}Extension on $superclassName {
363-
bool get is$className => $taggedUnionProperty == '$taggedUnionValue';
365+
bool get is$name => $taggedUnionProperty == '$taggedUnionValue';
364366
365-
$className get as$className => $className.fromJson(json, path: path);
367+
$className get as$name => $className.fromJson(json, path: path);
366368
}
367369
''');
368370
}

‎pkgs/json_syntax_generator/lib/src/generator/property_generator.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class PropertyGenerator {
8383
String sortOnKey,
8484
) {
8585
final classInfo = dartType.classInfo;
86-
final classType = classInfo.name;
86+
final classType = classInfo.className;
8787
final fieldName = property.name;
8888
final validateName = property.validateName;
8989
final isNullable = property.type.isNullable;

‎pkgs/json_syntax_generator/lib/src/model/class_info.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ sealed class ClassInfo {
99
/// The Dart class name.
1010
final String name;
1111

12+
String get className => '${name}Syntax';
13+
1214
ClassInfo({required this.name});
1315
}
1416

‎pkgs/json_syntax_generator/lib/src/model/dart_type.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class ClassDartType extends DartType {
9191
const ClassDartType({required this.classInfo, required super.isNullable});
9292

9393
@override
94-
String toNonNullableString() => classInfo.name;
94+
String toNonNullableString() => classInfo.className;
9595

9696
@override
9797
bool operator ==(Object other) =>

‎pkgs/native_assets_cli/lib/src/code_assets/architecture.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import 'dart:ffi' show Abi;
66

7-
import 'syntax.g.dart' as syntax;
7+
import 'syntax.g.dart';
88

99
/// A hardware architecture which the Dart VM can run on.
1010
final class Architecture {
@@ -82,25 +82,25 @@ final class Architecture {
8282
/// The name can be obtained from [Architecture.name] or
8383
/// [Architecture.toString].
8484
factory Architecture.fromString(String name) =>
85-
ArchitectureSyntax.fromSyntax(syntax.Architecture.fromJson(name));
85+
ArchitectureSyntaxExtension.fromSyntax(ArchitectureSyntax.fromJson(name));
8686

8787
/// The current [Architecture].
8888
static final Architecture current = _abiToArch[Abi.current()]!;
8989
}
9090

91-
extension ArchitectureSyntax on Architecture {
91+
extension ArchitectureSyntaxExtension on Architecture {
9292
static final _toSyntax = {
9393
for (final item in Architecture.values)
94-
item: syntax.Architecture.fromJson(item.name),
94+
item: ArchitectureSyntax.fromJson(item.name),
9595
};
9696

9797
static final _fromSyntax = {
9898
for (var entry in _toSyntax.entries) entry.value: entry.key,
9999
};
100100

101-
syntax.Architecture toSyntax() => _toSyntax[this]!;
101+
ArchitectureSyntax toSyntax() => _toSyntax[this]!;
102102

103-
static Architecture fromSyntax(syntax.Architecture syntax) =>
103+
static Architecture fromSyntax(ArchitectureSyntax syntax) =>
104104
switch (_fromSyntax[syntax]) {
105105
null => throw FormatException(
106106
'The architecture "${syntax.name}" is not known',

‎pkgs/native_assets_cli/lib/src/code_assets/c_compiler_config.dart

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'package:collection/collection.dart';
66

77
import 'config.dart';
88
import 'os.dart';
9-
import 'syntax.g.dart' as syntax;
9+
import 'syntax.g.dart';
1010

1111
/// The configuration for a C toolchain.
1212
final class CCompilerConfig {
@@ -108,44 +108,45 @@ final class DeveloperCommandPrompt {
108108
DeveloperCommandPrompt({required this.script, required this.arguments});
109109
}
110110

111-
extension CCompilerConfigSyntax on CCompilerConfig {
112-
syntax.CCompilerConfig toSyntax() => syntax.CCompilerConfig(
111+
extension CCompilerConfigSyntaxExtension on CCompilerConfig {
112+
CCompilerConfigSyntax toSyntax() => CCompilerConfigSyntax(
113113
ar: archiver,
114114
cc: compiler,
115115
ld: linker,
116116
windows: _windows?.toSyntax(),
117117
);
118118

119-
static CCompilerConfig fromSyntax(syntax.CCompilerConfig cCompiler) =>
119+
static CCompilerConfig fromSyntax(CCompilerConfigSyntax cCompiler) =>
120120
CCompilerConfig(
121121
archiver: cCompiler.ar,
122122
compiler: cCompiler.cc,
123123
linker: cCompiler.ld,
124124
windows: switch (cCompiler.windows) {
125125
null => null,
126-
final windows => WindowsCCompilerConfigSyntax.fromSyntax(windows),
126+
final windows => WindowsCCompilerConfigSyntaxExtension.fromSyntax(
127+
windows,
128+
),
127129
},
128130
);
129131
}
130132

131-
extension WindowsCCompilerConfigSyntax on WindowsCCompilerConfig {
132-
syntax.Windows toSyntax() => syntax.Windows(
133-
developerCommandPrompt: developerCommandPrompt?.toSyntax(),
134-
);
133+
extension WindowsCCompilerConfigSyntaxExtension on WindowsCCompilerConfig {
134+
WindowsSyntax toSyntax() =>
135+
WindowsSyntax(developerCommandPrompt: developerCommandPrompt?.toSyntax());
135136

136-
static WindowsCCompilerConfig fromSyntax(syntax.Windows windows) =>
137+
static WindowsCCompilerConfig fromSyntax(WindowsSyntax windows) =>
137138
WindowsCCompilerConfig(
138139
developerCommandPrompt: switch (windows.developerCommandPrompt) {
139140
null => null,
140-
final dcp => DeveloperCommandPromptSyntax.fromSyntax(dcp),
141+
final dcp => DeveloperCommandPromptSyntaxExtension.fromSyntax(dcp),
141142
},
142143
);
143144
}
144145

145-
extension DeveloperCommandPromptSyntax on DeveloperCommandPrompt {
146-
syntax.DeveloperCommandPrompt toSyntax() =>
147-
syntax.DeveloperCommandPrompt(script: script, arguments: arguments);
146+
extension DeveloperCommandPromptSyntaxExtension on DeveloperCommandPrompt {
147+
DeveloperCommandPromptSyntax toSyntax() =>
148+
DeveloperCommandPromptSyntax(script: script, arguments: arguments);
148149

149-
static DeveloperCommandPrompt fromSyntax(syntax.DeveloperCommandPrompt dcp) =>
150+
static DeveloperCommandPrompt fromSyntax(DeveloperCommandPromptSyntax dcp) =>
150151
DeveloperCommandPrompt(script: dcp.script, arguments: dcp.arguments);
151152
}

‎pkgs/native_assets_cli/lib/src/code_assets/code_asset.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import '../encoded_asset.dart';
77
import 'config.dart';
88
import 'link_mode.dart';
99
import 'os.dart';
10-
import 'syntax.g.dart' as syntax;
10+
import 'syntax.g.dart';
1111

1212
/// A code asset which respects the native application binary interface (ABI).
1313
///
@@ -85,13 +85,13 @@ final class CodeAsset {
8585

8686
factory CodeAsset.fromEncoded(EncodedAsset asset) {
8787
assert(asset.isCodeAsset);
88-
final syntaxNode = syntax.NativeCodeAssetEncoding.fromJson(
88+
final syntaxNode = NativeCodeAssetEncodingSyntax.fromJson(
8989
asset.encoding,
9090
path: asset.jsonPath ?? [],
9191
);
9292
return CodeAsset._(
9393
id: syntaxNode.id,
94-
linkMode: LinkModeSyntax.fromSyntax(syntaxNode.linkMode),
94+
linkMode: LinkModeSyntaxExtension.fromSyntax(syntaxNode.linkMode),
9595
file: syntaxNode.file,
9696
);
9797
}
@@ -115,7 +115,7 @@ final class CodeAsset {
115115
int get hashCode => Object.hash(id, linkMode, file);
116116

117117
EncodedAsset encode() {
118-
final encoding = syntax.NativeCodeAssetEncoding(
118+
final encoding = NativeCodeAssetEncodingSyntax(
119119
file: file,
120120
id: id,
121121
linkMode: linkMode.toSyntax(),
@@ -125,7 +125,7 @@ final class CodeAsset {
125125
}
126126

127127
extension CodeAssetType on CodeAsset {
128-
static const String type = syntax.NativeCodeAssetNew.typeValue;
128+
static const String type = NativeCodeAssetNewSyntax.typeValue;
129129
}
130130

131131
extension EncodedCodeAsset on EncodedAsset {

0 commit comments

Comments
 (0)