Skip to content

Commit 71b7a66

Browse files
authored
[record_use] (De)serialization context (dart-lang#3107)
1 parent 1931ea5 commit 71b7a66

4 files changed

Lines changed: 129 additions & 55 deletions

File tree

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

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import 'package:meta/meta.dart';
66

77
import 'helper.dart';
8+
import 'serialization_context.dart';
89
import 'syntax.g.dart';
910

1011
/// A value recorded during compilation.
@@ -55,33 +56,33 @@ abstract class Constant extends MaybeConstant {
5556
const Constant();
5657

5758
/// Converts this [Constant] object to a syntax representation.
58-
ConstantSyntax _toSyntax(Map<Constant, int> constants);
59+
ConstantSyntax _toSyntax(SerializationContext context);
5960

6061
/// Creates a [Constant] object from its syntax representation.
6162
static Constant _fromSyntax(
6263
ConstantSyntax syntax,
63-
List<Constant> constants,
64+
DeserializationContext context,
6465
) => switch (syntax) {
6566
NullConstantSyntax() => const NullConstant(),
6667
BoolConstantSyntax(:final value) => BoolConstant(value),
6768
IntConstantSyntax(:final value) => IntConstant(value),
6869
StringConstantSyntax(:final value) => StringConstant(value),
6970
ListConstantSyntax(:final value) => ListConstant(
70-
value!.cast<int>().map((i) => constants[i]).toList(),
71+
value!.cast<int>().map((i) => context.constants[i]).toList(),
7172
),
7273
MapConstantSyntax(:final value) => MapConstant(
7374
value
7475
.map(
7576
(e) => MapEntry(
76-
constants[e.key],
77-
constants[e.value],
77+
context.constants[e.key],
78+
context.constants[e.value],
7879
),
7980
)
8081
.toList(),
8182
),
8283
InstanceConstantSyntax(value: final value) => InstanceConstant(
8384
fields: (value?.json ?? {}).map(
84-
(key, value) => MapEntry(key, constants[value as int]),
85+
(key, value) => MapEntry(key, context.constants[value as int]),
8586
),
8687
),
8788
UnsupportedConstantSyntax(:final message) => UnsupportedConstant(message),
@@ -115,7 +116,7 @@ final class NullConstant extends Constant {
115116
const NullConstant() : super();
116117

117118
@override
118-
NullConstantSyntax _toSyntax(Map<Constant, int> constants) =>
119+
NullConstantSyntax _toSyntax(SerializationContext context) =>
119120
NullConstantSyntax();
120121

121122
@override
@@ -143,7 +144,7 @@ final class UnsupportedConstant extends Constant {
143144
const UnsupportedConstant(this.message);
144145

145146
@override
146-
UnsupportedConstantSyntax _toSyntax(Map<Constant, int> constants) =>
147+
UnsupportedConstantSyntax _toSyntax(SerializationContext context) =>
147148
UnsupportedConstantSyntax(message: message);
148149

149150
@override
@@ -173,7 +174,7 @@ final class BoolConstant extends Constant {
173174
const BoolConstant(this.value);
174175

175176
@override
176-
BoolConstantSyntax _toSyntax(Map<Constant, int> constants) =>
177+
BoolConstantSyntax _toSyntax(SerializationContext context) =>
177178
BoolConstantSyntax(value: value);
178179

179180
@override
@@ -202,7 +203,7 @@ final class IntConstant extends Constant {
202203
const IntConstant(this.value);
203204

204205
@override
205-
IntConstantSyntax _toSyntax(Map<Constant, int> constants) =>
206+
IntConstantSyntax _toSyntax(SerializationContext context) =>
206207
IntConstantSyntax(value: value);
207208

208209
@override
@@ -231,7 +232,7 @@ final class StringConstant extends Constant {
231232
const StringConstant(this.value);
232233

233234
@override
234-
StringConstantSyntax _toSyntax(Map<Constant, int> constants) =>
235+
StringConstantSyntax _toSyntax(SerializationContext context) =>
235236
StringConstantSyntax(value: value);
236237

237238
@override
@@ -270,9 +271,9 @@ final class ListConstant extends Constant {
270271
}
271272

272273
@override
273-
ListConstantSyntax _toSyntax(Map<Constant, int> constants) =>
274+
ListConstantSyntax _toSyntax(SerializationContext context) =>
274275
ListConstantSyntax(
275-
value: value.map((constant) => constants[constant]).toList(),
276+
value: value.map((constant) => context.constants[constant]!).toList(),
276277
);
277278

278279
@override
@@ -326,13 +327,13 @@ final class MapConstant extends Constant {
326327
}
327328

328329
@override
329-
MapConstantSyntax _toSyntax(Map<Constant, int> constants) =>
330+
MapConstantSyntax _toSyntax(SerializationContext context) =>
330331
MapConstantSyntax(
331332
value: entries
332333
.map(
333334
(entry) => MapEntrySyntax(
334-
key: constants[entry.key]!,
335-
value: constants[entry.value]!,
335+
key: context.constants[entry.key]!,
336+
value: context.constants[entry.value]!,
336337
),
337338
)
338339
.toList(),
@@ -377,12 +378,13 @@ final class InstanceConstant extends Constant {
377378
const InstanceConstant({required this.fields});
378379

379380
@override
380-
InstanceConstantSyntax _toSyntax(Map<Constant, int> constants) =>
381+
InstanceConstantSyntax _toSyntax(SerializationContext context) =>
381382
InstanceConstantSyntax(
382383
value: fields.isNotEmpty
383384
? JsonObjectSyntax.fromJson(
384385
fields.map(
385-
(name, constant) => MapEntry(name, constants[constant]!),
386+
(name, constant) =>
387+
MapEntry(name, context.constants[constant]!),
386388
),
387389
)
388390
: null,
@@ -429,8 +431,10 @@ final class InstanceConstant extends Constant {
429431
/// This avoids bloating the public API and public API docs and prevents
430432
/// internal types from leaking from the API.
431433
extension ConstantProtected on Constant {
432-
ConstantSyntax toSyntax(Map<Constant, int> constants) => _toSyntax(constants);
434+
ConstantSyntax toSyntax(SerializationContext context) => _toSyntax(context);
433435

434-
static Constant fromSyntax(ConstantSyntax syntax, List<Constant> constants) =>
435-
Constant._fromSyntax(syntax, constants);
436+
static Constant fromSyntax(
437+
ConstantSyntax syntax,
438+
DeserializationContext context,
439+
) => Constant._fromSyntax(syntax, context);
436440
}

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import 'definition.dart';
1212
import 'helper.dart';
1313
import 'metadata.dart';
1414
import 'reference.dart';
15+
import 'serialization_context.dart';
1516
import 'syntax.g.dart';
1617

1718
/// [Recordings] combines recordings of calls and instances with metadata.
@@ -66,8 +67,9 @@ Error: $e
6667

6768
factory Recordings._fromSyntax(RecordedUsesSyntax syntax) {
6869
final constants = <Constant>[];
70+
final context = DeserializationContext(constants);
6971
for (final constantSyntax in syntax.constants ?? <ConstantSyntax>[]) {
70-
final constant = ConstantProtected.fromSyntax(constantSyntax, constants);
72+
final constant = ConstantProtected.fromSyntax(constantSyntax, context);
7173
if (!constants.contains(constant)) {
7274
constants.add(constant);
7375
}
@@ -85,7 +87,7 @@ Error: $e
8587
.map<CallReference>(
8688
(callSyntax) => CallReferenceProtected.fromSyntax(
8789
callSyntax,
88-
constants,
90+
context,
8991
),
9092
)
9193
.toList();
@@ -98,7 +100,7 @@ Error: $e
98100
.map<InstanceReference>(
99101
(instanceSyntax) => InstanceReferenceProtected.fromSyntax(
100102
instanceSyntax,
101-
constants,
103+
context,
102104
),
103105
)
104106
.toList();
@@ -160,6 +162,8 @@ Error: $e
160162
),
161163
}.flatten().asMapToIndices;
162164

165+
final context = SerializationContext(constantsIndex);
166+
163167
final recordings = <RecordingSyntax>[];
164168
final allDefinitions = {
165169
...calls.keys,
@@ -172,10 +176,10 @@ Error: $e
172176
RecordingSyntax(
173177
definition: definition.toSyntax(),
174178
calls: callsForDefinition
175-
?.map((call) => call.toSyntax(constantsIndex))
179+
?.map((call) => call.toSyntax(context))
176180
.toList(),
177181
instances: instancesForDefinition
178-
?.map((instance) => instance.toSyntax(constantsIndex))
182+
?.map((instance) => instance.toSyntax(context))
179183
.toList(),
180184
),
181185
);
@@ -187,7 +191,7 @@ Error: $e
187191
? null
188192
: constantsIndex.keys
189193
.map(
190-
(Constant constant) => constant.toSyntax(constantsIndex),
194+
(Constant constant) => constant.toSyntax(context),
191195
)
192196
.toList(),
193197
recordings: recordings.isEmpty ? null : recordings,

0 commit comments

Comments
 (0)