Skip to content

Commit 1ebc211

Browse files
authored
[record_use] LoadingUnit Dart API (dart-lang#3123)
Dart API for: * dart-lang#2979 * dart-lang#3022 In the future we might add the full graph of loading units if necessary.
1 parent 3879dca commit 1ebc211

13 files changed

Lines changed: 194 additions & 66 deletions

‎pkgs/hooks_runner/test/build_runner/resources_test.dart‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ import 'helpers.dart';
1515

1616
const Timeout longTimeout = Timeout(Duration(minutes: 5));
1717

18+
const loadingUnitRoot = LoadingUnit('root');
19+
1820
void main() async {
1921
test('simple_link linking', timeout: longTimeout, () async {
2022
await inTempDir((tempUri) async {
@@ -129,12 +131,12 @@ final _pirateAdventureRecordings = Recordings(
129131
),
130132
]): [
131133
const CallWithArguments(
132-
loadingUnit: 'root',
134+
loadingUnits: [loadingUnitRoot],
133135
positionalArguments: [StringConstant('Hello')],
134136
namedArguments: {},
135137
),
136138
const CallWithArguments(
137-
loadingUnit: 'root',
139+
loadingUnits: [loadingUnitRoot],
138140
positionalArguments: [StringConstant('Money')],
139141
namedArguments: {},
140142
),
@@ -147,7 +149,7 @@ final _pirateAdventureRecordings = Recordings(
147149
),
148150
]): [
149151
const CallWithArguments(
150-
loadingUnit: 'root',
152+
loadingUnits: [loadingUnitRoot],
151153
positionalArguments: [],
152154
namedArguments: {},
153155
),

‎pkgs/record_use/lib/record_use.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ export 'src/constant.dart'
1717
UnsupportedConstant;
1818
export 'src/definition.dart'
1919
show Definition, DefinitionDisambiguator, DefinitionKind, Name;
20+
export 'src/loading_unit.dart' show LoadingUnit;
2021
export 'src/metadata.dart' show Metadata;
2122
export 'src/record_use.dart' show RecordedUsages;
2223
export 'src/recorded_usage_from_file.dart' show parseFromFile;

‎pkgs/record_use/lib/record_use_internal.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ export 'src/constant.dart'
1717
UnsupportedConstant;
1818
export 'src/definition.dart'
1919
show Definition, DefinitionDisambiguator, DefinitionKind, Name;
20+
export 'src/loading_unit.dart' show LoadingUnit;
2021
export 'src/metadata.dart' show Metadata;
2122
export 'src/record_use.dart' show RecordedUsages;
2223
export 'src/recordings.dart'
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Copyright (c) 2026, the Dart project authors. Please see the AUTHORS file
2+
// for details. All rights reserved. Use of this source code is governed by a
3+
// BSD-style license that can be found in the LICENSE file.
4+
5+
import 'definition.dart';
6+
7+
/// A loading unit in which a usage of a [Definition] was recorded.
8+
final class LoadingUnit {
9+
/// The name of the loading unit.
10+
final String name;
11+
12+
const LoadingUnit(this.name);
13+
14+
@override
15+
bool operator ==(Object other) {
16+
if (identical(this, other)) return true;
17+
18+
return other is LoadingUnit && other.name == name;
19+
}
20+
21+
@override
22+
int get hashCode => name.hashCode;
23+
24+
@override
25+
String toString() => 'LoadingUnit($name)';
26+
}

‎pkgs/record_use/lib/src/recordings.dart‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import 'package:meta/meta.dart';
1010
import 'constant.dart';
1111
import 'definition.dart';
1212
import 'helper.dart';
13+
import 'loading_unit.dart';
1314
import 'metadata.dart';
1415
import 'reference.dart';
1516
import 'serialization_context.dart';
@@ -116,9 +117,9 @@ Error: $e
116117
static LoadingUnitDeserializationContext _deserializeLoadingUnits(
117118
RecordedUsesSyntax syntax,
118119
) {
119-
final loadingUnits = <String>[];
120+
final loadingUnits = <LoadingUnit>[];
120121
for (final unit in syntax.loadingUnits ?? <LoadingUnitSyntax>[]) {
121-
loadingUnits.add(unit.name);
122+
loadingUnits.add(LoadingUnit(unit.name));
122123
}
123124
return LoadingUnitDeserializationContext(loadingUnits);
124125
}
@@ -200,7 +201,7 @@ Error: $e
200201
loadingUnits: allLoadingUnits.isEmpty
201202
? null
202203
: allLoadingUnits
203-
.map((unit) => LoadingUnitSyntax(name: unit))
204+
.map((unit) => LoadingUnitSyntax(name: unit.name))
204205
.toList(),
205206
definitions: context.definitions.isEmpty
206207
? null
@@ -252,15 +253,17 @@ Error: $e
252253
),
253254
}.flatten();
254255

255-
Iterable<String> _collectLoadingUnits() => {
256-
...calls.values.expand((calls) => calls).map((call) => call.loadingUnit!),
256+
Iterable<LoadingUnit> _collectLoadingUnits() => {
257+
...calls.values
258+
.expand((calls) => calls)
259+
.expand((call) => call.loadingUnits),
257260
...instances.values
258261
.expand((instances) => instances)
259-
.map((instance) => instance.loadingUnit!),
262+
.expand((instance) => instance.loadingUnits),
260263
};
261264

262265
LoadingUnitSerializationContext _serializeLoadingUnits(
263-
Iterable<String> allLoadingUnits,
266+
Iterable<LoadingUnit> allLoadingUnits,
264267
) => LoadingUnitSerializationContext(
265268
allLoadingUnits.asMapToIndices,
266269
);

0 commit comments

Comments
 (0)