Skip to content

Commit 66273ee

Browse files
committed
Rename
1 parent e3c5bb6 commit 66273ee

File tree

14 files changed

+45
-41
lines changed

14 files changed

+45
-41
lines changed

pkgs/code_assets/doc/schema/shared/shared_definitions.generated.schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"$ref": "shared_definitions.schema.json#/definitions/Asset"
4343
}
4444
},
45-
"assets_for_link": {
45+
"assets_for_linking": {
4646
"type": "object",
4747
"additionalProperties": {
4848
"type": "array",

pkgs/code_assets/test/data/build_output_macos.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"type": "code_assets/code"
6363
}
6464
],
65-
"assets_for_link": {
65+
"assets_for_linking": {
6666
"package_with_linker": [
6767
{
6868
"encoding": {

pkgs/code_assets/test/json_schema/schema_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ FieldsFunction _codeFields(AllTestData allTestData) {
123123
for (final (field, expect) in codeAssetFields)
124124
for (final path in [
125125
['assets_for_build'],
126-
['assets_for_link', 'package_with_linker'],
126+
['assets_for_linking', 'package_with_linker'],
127127
])
128128
([...path, 0, 'encoding', ...field], expect),
129129
],

pkgs/data_assets/doc/schema/shared/shared_definitions.generated.schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"$ref": "shared_definitions.schema.json#/definitions/Asset"
4343
}
4444
},
45-
"assets_for_link": {
45+
"assets_for_linking": {
4646
"type": "object",
4747
"additionalProperties": {
4848
"type": "array",

pkgs/data_assets/test/data/build_output.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"type": "data_assets/data"
3737
}
3838
],
39-
"assets_for_link": {
39+
"assets_for_linking": {
4040
"package_with_linker": [
4141
{
4242
"encoding": {

pkgs/data_assets/test/json_schema/schema_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ List<(List<Object>, void Function(ValidationResults result))> _dataFields({
5555
for (final field in _dataAssetFields)
5656
for (final path in [
5757
['assets_for_build'],
58-
['assets_for_link', 'package_with_linker'],
58+
['assets_for_linking', 'package_with_linker'],
5959
])
6060
([...path, 0, 'encoding', field], expectRequiredFieldMissing),
6161
],

pkgs/hooks/doc/schema/shared/shared_definitions.schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
"$ref": "#/definitions/Asset"
198198
}
199199
},
200-
"assets_for_link": {
200+
"assets_for_linking": {
201201
"type": "object",
202202
"additionalProperties": {
203203
"type": "array",

pkgs/hooks/lib/src/config.dart

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ sealed class HookOutputBuilder {
479479
dependencies: null,
480480
status: OutputStatusSyntax.success,
481481
failureDetails: null,
482-
assetsForLink: {},
482+
assetsForLinking: {},
483483
);
484484

485485
/// The JSON representation of this hook output builder.
@@ -531,7 +531,8 @@ final class BuildOutput extends HookOutput implements BuildOutputMaybeFailure {
531531
/// bundled with the application, but are sent to the link hook of the package
532532
/// specified in the key, which can decide if they are bundled or not.
533533
Map<String, List<EncodedAsset>> get _encodedAssetsForLinking => {
534-
for (final MapEntry(:key, :value) in (_syntax.assetsForLink ?? {}).entries)
534+
for (final MapEntry(:key, :value)
535+
in (_syntax.assetsForLinking ?? {}).entries)
535536
key: EncodedAssetSyntax._fromSyntax(value),
536537
};
537538

@@ -742,10 +743,12 @@ final class BuildOutputAssetsBuilder {
742743
_syntax.assetsForBuild = assets;
743744
case ToLinkHook():
744745
final packageName = routing.packageName;
745-
final assetsForLink = _syntax.assetsForLink ?? {};
746-
assetsForLink[packageName] ??= [];
747-
assetsForLink[packageName]!.add(AssetSyntax.fromJson(asset.toJson()));
748-
_syntax.assetsForLink = assetsForLink;
746+
final assetsForLinking = _syntax.assetsForLinking ?? {};
747+
assetsForLinking[packageName] ??= [];
748+
assetsForLinking[packageName]!.add(
749+
AssetSyntax.fromJson(asset.toJson()),
750+
);
751+
_syntax.assetsForLinking = assetsForLinking;
749752
}
750753
}
751754

@@ -783,12 +786,12 @@ final class BuildOutputAssetsBuilder {
783786
_syntax.assetsForBuild = list;
784787
case ToLinkHook():
785788
final linkInPackage = routing.packageName;
786-
final assetsForLink = _syntax.assetsForLink ?? {};
787-
final list = assetsForLink[linkInPackage] ??= [];
789+
final assetsForLinking = _syntax.assetsForLinking ?? {};
790+
final list = assetsForLinking[linkInPackage] ??= [];
788791
for (final asset in assets) {
789792
list.add(AssetSyntax.fromJson(asset.toJson()));
790793
}
791-
_syntax.assetsForLink = assetsForLink;
794+
_syntax.assetsForLinking = assetsForLinking;
792795
}
793796
}
794797

@@ -806,7 +809,8 @@ final class LinkOutput extends HookOutput implements LinkOutputMaybeFailure {
806809
/// bundled with the application, but are sent to the link hook of the package
807810
/// specified in the key, which can decide what to do with them.
808811
Map<String, List<EncodedAsset>> get _encodedAssetsForLink => {
809-
for (final MapEntry(:key, :value) in (_syntax.assetsForLink ?? {}).entries)
812+
for (final MapEntry(:key, :value)
813+
in (_syntax.assetsForLinking ?? {}).entries)
810814
key: EncodedAssetSyntax._fromSyntax(value),
811815
};
812816

@@ -891,12 +895,12 @@ final class LinkOutputAssetsBuilder {
891895
_syntax.assets = assets;
892896
case ToLinkHook():
893897
final packageName = routing.packageName;
894-
final assetsForLinking = _syntax.assetsForLink ?? {};
898+
final assetsForLinking = _syntax.assetsForLinking ?? {};
895899
assetsForLinking[packageName] ??= [];
896900
assetsForLinking[packageName]!.add(
897901
AssetSyntax.fromJson(asset.toJson()),
898902
);
899-
_syntax.assetsForLink = assetsForLinking;
903+
_syntax.assetsForLinking = assetsForLinking;
900904
}
901905
}
902906

@@ -926,12 +930,12 @@ final class LinkOutputAssetsBuilder {
926930
_syntax.assets = list;
927931
case ToLinkHook():
928932
final linkInPackage = routing.packageName;
929-
final assetsForLinking = _syntax.assetsForLink ?? {};
933+
final assetsForLinking = _syntax.assetsForLinking ?? {};
930934
final list = assetsForLinking[linkInPackage] ??= [];
931935
for (final asset in assets) {
932936
list.add(AssetSyntax.fromJson(asset.toJson()));
933937
}
934-
_syntax.assetsForLink = assetsForLinking;
938+
_syntax.assetsForLinking = assetsForLinking;
935939
}
936940
}
937941

pkgs/hooks/lib/src/hooks/syntax.g.dart

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ class BuildOutputSyntax extends HookOutputSyntax {
216216
BuildOutputSyntax({
217217
required super.assets,
218218
required List<AssetSyntax>? assetsForBuild,
219-
required super.assetsForLink,
219+
required super.assetsForLinking,
220220
required super.dependencies,
221221
required super.failureDetails,
222222
required super.status,
@@ -519,14 +519,14 @@ class HookOutputSyntax extends JsonObjectSyntax {
519519

520520
HookOutputSyntax({
521521
required List<AssetSyntax>? assets,
522-
required Map<String, List<AssetSyntax>>? assetsForLink,
522+
required Map<String, List<AssetSyntax>>? assetsForLinking,
523523
required List<Uri>? dependencies,
524524
required FailureSyntax? failureDetails,
525525
required OutputStatusSyntax? status,
526526
required String timestamp,
527527
}) : super() {
528528
this.assets = assets;
529-
this.assetsForLink = assetsForLink;
529+
this.assetsForLinking = assetsForLinking;
530530
this.dependencies = dependencies;
531531
this.failureDetails = failureDetails;
532532
this.status = status;
@@ -569,8 +569,8 @@ class HookOutputSyntax extends JsonObjectSyntax {
569569
return [for (final element in elements) ...element.validate()];
570570
}
571571

572-
Map<String, List<AssetSyntax>>? get assetsForLink {
573-
final jsonValue = _reader.optionalMap('assets_for_link');
572+
Map<String, List<AssetSyntax>>? get assetsForLinking {
573+
final jsonValue = _reader.optionalMap('assets_for_linking');
574574
if (jsonValue == null) {
575575
return null;
576576
}
@@ -587,29 +587,29 @@ class HookOutputSyntax extends JsonObjectSyntax {
587587
return result;
588588
}
589589

590-
set assetsForLink(Map<String, List<AssetSyntax>>? value) {
590+
set assetsForLinking(Map<String, List<AssetSyntax>>? value) {
591591
if (value == null) {
592-
json.remove('assets_for_link');
592+
json.remove('assets_for_linking');
593593
} else {
594-
json['assets_for_link'] = {
594+
json['assets_for_linking'] = {
595595
for (final MapEntry(:key, :value) in value.entries)
596596
key: [for (final item in value) item.json],
597597
};
598598
}
599599
json.sortOnKey();
600600
}
601601

602-
List<String> _validateAssetsForLink() {
603-
final mapErrors = _reader.validateOptionalMap('assets_for_link');
602+
List<String> _validateAssetsForLinking() {
603+
final mapErrors = _reader.validateOptionalMap('assets_for_linking');
604604
if (mapErrors.isNotEmpty) {
605605
return mapErrors;
606606
}
607-
final jsonValue = _reader.optionalMap('assets_for_link');
607+
final jsonValue = _reader.optionalMap('assets_for_linking');
608608
if (jsonValue == null) {
609609
return [];
610610
}
611611
final result = <String>[];
612-
for (final list in assetsForLink!.values) {
612+
for (final list in assetsForLinking!.values) {
613613
for (final element in list) {
614614
result.addAll(element.validate());
615615
}
@@ -677,7 +677,7 @@ class HookOutputSyntax extends JsonObjectSyntax {
677677
List<String> validate() => [
678678
...super.validate(),
679679
..._validateAssets(),
680-
..._validateAssetsForLink(),
680+
..._validateAssetsForLinking(),
681681
..._validateDependencies(),
682682
..._validateFailureDetails(),
683683
..._validateStatus(),
@@ -860,7 +860,7 @@ class LinkOutputSyntax extends HookOutputSyntax {
860860

861861
LinkOutputSyntax({
862862
required super.assets,
863-
required super.assetsForLink,
863+
required super.assetsForLinking,
864864
required super.dependencies,
865865
required super.failureDetails,
866866
required super.status,

pkgs/hooks/test/build_output_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ void main() {
7474
'type': 'my-asset-type',
7575
},
7676
],
77-
'assets_for_link': {
77+
'assets_for_linking': {
7878
'package:linker1': [
7979
{
8080
'encoding': {'a-1': 'v-1'},

0 commit comments

Comments
 (0)