Skip to content

Commit 3879dca

Browse files
authored
[record_use] Store multiple loading units (dart-lang#3122)
1 parent 1ef9fb1 commit 3879dca

40 files changed

Lines changed: 239 additions & 107 deletions

‎pkgs/record_use/doc/schema/record_use.schema.json‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,15 @@
1919
}
2020
]
2121
},
22-
"loading_unit_index": {
23-
"type": "integer"
22+
"loading_unit_indices": {
23+
"type": "array",
24+
"items": {
25+
"type": "integer"
26+
}
2427
}
2528
},
2629
"required": [
27-
"loading_unit_index",
30+
"loading_unit_indices",
2831
"type"
2932
],
3033
"if": {
@@ -281,12 +284,15 @@
281284
}
282285
]
283286
},
284-
"loading_unit_index": {
285-
"type": "integer"
287+
"loading_unit_indices": {
288+
"type": "array",
289+
"items": {
290+
"type": "integer"
291+
}
286292
}
287293
},
288294
"required": [
289-
"loading_unit_index",
295+
"loading_unit_indices",
290296
"type"
291297
],
292298
"allOf": [

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

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ sealed class CallReference extends Reference {
5555
DeserializationContext context,
5656
) => switch (syntax) {
5757
TearoffCallSyntax() => CallTearoff(
58-
loadingUnit: context.loadingUnits[syntax.loadingUnitIndex],
58+
loadingUnit: context.loadingUnits[syntax.loadingUnitIndices.first],
5959
),
6060
WithArgumentsCallSyntax(
6161
:final named,
6262
:final positional,
63-
:final loadingUnitIndex,
63+
:final loadingUnitIndices,
6464
) =>
6565
CallWithArguments(
6666
positionalArguments: (positional ?? [])
@@ -69,7 +69,7 @@ sealed class CallReference extends Reference {
6969
namedArguments: (named ?? {}).map(
7070
(name, index) => MapEntry(name, _argumentFromSyntax(index, context)),
7171
),
72-
loadingUnit: context.loadingUnits[loadingUnitIndex],
72+
loadingUnit: context.loadingUnits[loadingUnitIndices.first],
7373
),
7474
_ => throw UnimplementedError('Unknown CallSyntax type'),
7575
};
@@ -129,7 +129,7 @@ final class CallWithArguments extends CallReference {
129129
}
130130

131131
return WithArgumentsCallSyntax(
132-
loadingUnitIndex: context.loadingUnits[loadingUnit!]!,
132+
loadingUnitIndices: [context.loadingUnits[loadingUnit!]!],
133133
named: namedArgs.isNotEmpty ? namedArgs : null,
134134
positional: positionalArguments.isEmpty
135135
? null
@@ -240,7 +240,9 @@ final class CallTearoff extends CallReference {
240240

241241
@override
242242
TearoffCallSyntax _toSyntax(SerializationContext context) =>
243-
TearoffCallSyntax(loadingUnitIndex: context.loadingUnits[loadingUnit!]!);
243+
TearoffCallSyntax(
244+
loadingUnitIndices: [context.loadingUnits[loadingUnit!]!],
245+
);
244246

245247
@override
246248
@visibleForTesting
@@ -274,16 +276,16 @@ sealed class InstanceReference extends Reference {
274276
) => switch (syntax) {
275277
ConstantInstanceSyntax(
276278
:final constantIndex,
277-
:final loadingUnitIndex,
279+
:final loadingUnitIndices,
278280
) =>
279281
InstanceConstantReference(
280282
instanceConstant: context.constants[constantIndex] as InstanceConstant,
281-
loadingUnit: context.loadingUnits[loadingUnitIndex],
283+
loadingUnit: context.loadingUnits[loadingUnitIndices.first],
282284
),
283285
CreationInstanceSyntax(
284286
:final named,
285287
:final positional,
286-
:final loadingUnitIndex,
288+
:final loadingUnitIndices,
287289
) =>
288290
InstanceCreationReference(
289291
positionalArguments: (positional ?? [])
@@ -295,11 +297,11 @@ sealed class InstanceReference extends Reference {
295297
CallReference._argumentFromSyntax(index, context),
296298
),
297299
),
298-
loadingUnit: context.loadingUnits[loadingUnitIndex],
300+
loadingUnit: context.loadingUnits[loadingUnitIndices.first],
299301
),
300-
TearoffInstanceSyntax(:final loadingUnitIndex) =>
302+
TearoffInstanceSyntax(:final loadingUnitIndices) =>
301303
ConstructorTearoffReference(
302-
loadingUnit: context.loadingUnits[loadingUnitIndex],
304+
loadingUnit: context.loadingUnits[loadingUnitIndices.first],
303305
),
304306
_ => throw UnimplementedError('Unknown InstanceSyntax type'),
305307
};
@@ -333,7 +335,7 @@ final class InstanceConstantReference extends InstanceReference {
333335
ConstantInstanceSyntax _toSyntax(SerializationContext context) =>
334336
ConstantInstanceSyntax(
335337
constantIndex: context.constants[instanceConstant]!,
336-
loadingUnitIndex: context.loadingUnits[loadingUnit!]!,
338+
loadingUnitIndices: [context.loadingUnits[loadingUnit!]!],
337339
);
338340

339341
@override
@@ -394,7 +396,7 @@ final class InstanceCreationReference extends InstanceReference {
394396
}
395397

396398
return CreationInstanceSyntax(
397-
loadingUnitIndex: context.loadingUnits[loadingUnit!]!,
399+
loadingUnitIndices: [context.loadingUnits[loadingUnit!]!],
398400
named: namedArgs.isNotEmpty ? namedArgs : null,
399401
positional: positionalArguments.isEmpty
400402
? null
@@ -479,7 +481,7 @@ final class ConstructorTearoffReference extends InstanceReference {
479481
@override
480482
TearoffInstanceSyntax _toSyntax(SerializationContext context) =>
481483
TearoffInstanceSyntax(
482-
loadingUnitIndex: context.loadingUnits[loadingUnit!]!,
484+
loadingUnitIndices: [context.loadingUnits[loadingUnit!]!],
483485
);
484486

485487
@override

‎pkgs/record_use/lib/src/syntax.g.dart‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -71,23 +71,23 @@ class CallSyntax extends JsonObjectSyntax {
7171
}) : super.fromJson();
7272

7373
CallSyntax({
74-
required int loadingUnitIndex,
74+
required List<int> loadingUnitIndices,
7575
required String type,
7676
super.path = const [],
7777
}) : super() {
78-
_loadingUnitIndex = loadingUnitIndex;
78+
_loadingUnitIndices = loadingUnitIndices;
7979
_type = type;
8080
json.sortOnKey();
8181
}
8282

83-
int get loadingUnitIndex => _reader.get<int>('loading_unit_index');
83+
List<int> get loadingUnitIndices => _reader.list<int>('loading_unit_indices');
8484

85-
set _loadingUnitIndex(int value) {
86-
json.setOrRemove('loading_unit_index', value);
85+
set _loadingUnitIndices(List<int> value) {
86+
json['loading_unit_indices'] = value;
8787
}
8888

89-
List<String> _validateLoadingUnitIndex() =>
90-
_reader.validate<int>('loading_unit_index');
89+
List<String> _validateLoadingUnitIndices() =>
90+
_reader.validateList<int>('loading_unit_indices');
9191

9292
String get type => _reader.get<String>('type');
9393

@@ -100,7 +100,7 @@ class CallSyntax extends JsonObjectSyntax {
100100
@override
101101
List<String> validate() => [
102102
...super.validate(),
103-
..._validateLoadingUnitIndex(),
103+
..._validateLoadingUnitIndices(),
104104
..._validateType(),
105105
];
106106

@@ -213,7 +213,7 @@ class ConstantInstanceSyntax extends InstanceSyntax {
213213

214214
ConstantInstanceSyntax({
215215
required int constantIndex,
216-
required super.loadingUnitIndex,
216+
required super.loadingUnitIndices,
217217
super.path = const [],
218218
}) : super(type: 'constant') {
219219
_constantIndex = constantIndex;
@@ -285,7 +285,7 @@ class CreationInstanceSyntax extends InstanceSyntax {
285285
}) : super._fromJson();
286286

287287
CreationInstanceSyntax({
288-
required super.loadingUnitIndex,
288+
required super.loadingUnitIndices,
289289
Map<String, int?>? named,
290290
List<int?>? positional,
291291
super.path = const [],
@@ -553,23 +553,23 @@ class InstanceSyntax extends JsonObjectSyntax {
553553
}) : super.fromJson();
554554

555555
InstanceSyntax({
556-
required int loadingUnitIndex,
556+
required List<int> loadingUnitIndices,
557557
required String type,
558558
super.path = const [],
559559
}) : super() {
560-
_loadingUnitIndex = loadingUnitIndex;
560+
_loadingUnitIndices = loadingUnitIndices;
561561
_type = type;
562562
json.sortOnKey();
563563
}
564564

565-
int get loadingUnitIndex => _reader.get<int>('loading_unit_index');
565+
List<int> get loadingUnitIndices => _reader.list<int>('loading_unit_indices');
566566

567-
set _loadingUnitIndex(int value) {
568-
json.setOrRemove('loading_unit_index', value);
567+
set _loadingUnitIndices(List<int> value) {
568+
json['loading_unit_indices'] = value;
569569
}
570570

571-
List<String> _validateLoadingUnitIndex() =>
572-
_reader.validate<int>('loading_unit_index');
571+
List<String> _validateLoadingUnitIndices() =>
572+
_reader.validateList<int>('loading_unit_indices');
573573

574574
String get type => _reader.get<String>('type');
575575

@@ -582,7 +582,7 @@ class InstanceSyntax extends JsonObjectSyntax {
582582
@override
583583
List<String> validate() => [
584584
...super.validate(),
585-
..._validateLoadingUnitIndex(),
585+
..._validateLoadingUnitIndices(),
586586
..._validateType(),
587587
];
588588

@@ -1484,7 +1484,7 @@ class TearoffCallSyntax extends CallSyntax {
14841484
super.path,
14851485
}) : super._fromJson();
14861486

1487-
TearoffCallSyntax({required super.loadingUnitIndex, super.path = const []})
1487+
TearoffCallSyntax({required super.loadingUnitIndices, super.path = const []})
14881488
: super(type: 'tearoff');
14891489

14901490
@override
@@ -1510,7 +1510,7 @@ class TearoffInstanceSyntax extends InstanceSyntax {
15101510
}) : super._fromJson();
15111511

15121512
TearoffInstanceSyntax({
1513-
required super.loadingUnitIndex,
1513+
required super.loadingUnitIndices,
15141514
super.path = const [],
15151515
}) : super(type: 'tearoff');
15161516

@@ -1578,7 +1578,7 @@ class WithArgumentsCallSyntax extends CallSyntax {
15781578
}) : super._fromJson();
15791579

15801580
WithArgumentsCallSyntax({
1581-
required super.loadingUnitIndex,
1581+
required super.loadingUnitIndices,
15821582
Map<String, int?>? named,
15831583
List<int?>? positional,
15841584
super.path = const [],

‎pkgs/record_use/test/json_schema/schema_test.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ List<SchemaTestField> recordUseFields = [
116116
(['recordings', 0, 'calls', 0, 'positional', 0], expectOptionalFieldMissing),
117117
(['recordings', 0, 'calls', 0, 'positional', 3], expectOptionalFieldMissing),
118118
(
119-
['recordings', 0, 'calls', 0, 'loading_unit_index'],
119+
['recordings', 0, 'calls', 0, 'loading_unit_indices'],
120120
expectRequiredFieldMissing,
121121
),
122122
(['recordings', 1, 'instances'], expectOptionalFieldMissing),
@@ -126,14 +126,14 @@ List<SchemaTestField> recordUseFields = [
126126
expectRequiredFieldMissing,
127127
),
128128
(
129-
['recordings', 1, 'instances', 0, 'loading_unit_index'],
129+
['recordings', 1, 'instances', 0, 'loading_unit_indices'],
130130
expectRequiredFieldMissing,
131131
),
132132
];
133133

134134
List<SchemaTestField> constructorInvocationFields = [
135135
(
136-
['recordings', 0, 'instances', 0, 'loading_unit_index'],
136+
['recordings', 0, 'instances', 0, 'loading_unit_indices'],
137137
expectRequiredFieldMissing,
138138
),
139139
(['recordings', 0, 'instances', 0, 'type'], expectRequiredFieldMissing),

‎pkgs/record_use/test/maybe_constant_test.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ void main() {
3030
'calls': [
3131
{
3232
'type': 'with_arguments',
33-
'loading_unit_index': 0,
33+
'loading_unit_indices': [0],
3434
'positional': [0, 1, null],
3535
'named': {'a': 0, 'b': 1, 'c': null},
3636
},

‎pkgs/record_use/test_data/json/basic.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@
3737
{
3838
"calls": [
3939
{
40-
"loading_unit_index": 0,
40+
"loading_unit_indices": [
41+
0
42+
],
4143
"positional": [
4244
0
4345
],

‎pkgs/record_use/test_data/json/complex.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@
3737
{
3838
"calls": [
3939
{
40-
"loading_unit_index": 0,
40+
"loading_unit_indices": [
41+
0
42+
],
4143
"positional": [
4244
null,
4345
null,

‎pkgs/record_use/test_data/json/const_argument_instance.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@
3737
{
3838
"calls": [
3939
{
40-
"loading_unit_index": 0,
40+
"loading_unit_indices": [
41+
0
42+
],
4143
"positional": [
4244
1
4345
],

‎pkgs/record_use/test_data/json/constructor_invocation.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@
3939
"definition_index": 0,
4040
"instances": [
4141
{
42-
"loading_unit_index": 0,
42+
"loading_unit_indices": [
43+
0
44+
],
4345
"named": {
4446
"other": null,
4547
"param": 2

‎pkgs/record_use/test_data/json/enum_const_arg.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@
4242
{
4343
"calls": [
4444
{
45-
"loading_unit_index": 0,
45+
"loading_unit_indices": [
46+
0
47+
],
4648
"positional": [
4749
2
4850
],

0 commit comments

Comments
 (0)