@@ -66,15 +66,14 @@ Error: $e
6666 }
6767
6868 factory Recordings ._fromSyntax (RecordedUsesSyntax syntax) {
69- final context = _deserializeConstants (syntax);
69+ final definitionContext = _deserializeDefinitions (syntax);
70+ final context = _deserializeConstants (syntax, definitionContext);
7071
7172 final callsForDefinition = < Definition , List <CallReference >> {};
7273 final instancesForDefinition = < Definition , List <InstanceReference >> {};
7374
7475 for (final recordingSyntax in syntax.recordings ?? < RecordingSyntax > []) {
75- final definition = DefinitionProtected .fromSyntax (
76- recordingSyntax.definition,
77- );
76+ final definition = context.definitions[recordingSyntax.definitionIndex];
7877 if (recordingSyntax.calls case final callSyntaxes? ) {
7978 final callReferences = callSyntaxes
8079 .map <CallReference >(
@@ -110,15 +109,29 @@ Error: $e
110109 );
111110 }
112111
112+ static DefinitionDeserializationContext _deserializeDefinitions (
113+ RecordedUsesSyntax syntax,
114+ ) {
115+ final definitions = < Definition > [];
116+ for (final definitionSyntax in syntax.definitions ?? < DefinitionSyntax > []) {
117+ definitions.add (DefinitionProtected .fromSyntax (definitionSyntax));
118+ }
119+ return DefinitionDeserializationContext (definitions);
120+ }
121+
113122 static DeserializationContext _deserializeConstants (
114123 RecordedUsesSyntax syntax,
124+ DefinitionDeserializationContext definitionContext,
115125 ) {
116126 final constants = < Constant > [];
117127 // Create a context that includes an empty list for the constants. This
118128 // list will be populated by [_deserializeConstants], providing the
119129 // self-referential access needed to resolve recursive constants (e.g.
120130 // list and map constants).
121- final context = DeserializationContext (constants);
131+ final context = DeserializationContext .fromPrevious (
132+ definitionContext,
133+ constants,
134+ );
122135 for (final constantSyntax in syntax.constants ?? < ConstantSyntax > []) {
123136 final constant = ConstantProtected .fromSyntax (constantSyntax, context);
124137 if (! constants.contains (constant)) {
@@ -135,19 +148,19 @@ Error: $e
135148
136149 RecordedUsesSyntax _toSyntax () {
137150 final allConstants = _collectConstants ();
138- final (context, constantSyntax) = _serializeConstants (allConstants);
151+ final definitionContext = _serializeDefinitions (allConstants);
152+ final (context, constantSyntax) = _serializeConstants (
153+ allConstants,
154+ definitionContext,
155+ );
139156
140157 final recordings = < RecordingSyntax > [];
141- final allDefinitions = {
142- ...calls.keys,
143- ...instances.keys,
144- };
145- for (final definition in allDefinitions) {
158+ for (final definition in context.definitions.keys) {
146159 final callsForDefinition = calls[definition];
147160 final instancesForDefinition = instances[definition];
148161 recordings.add (
149162 RecordingSyntax (
150- definition : definition. toSyntax () ,
163+ definitionIndex : context.definitions[definition] ! ,
151164 calls: callsForDefinition
152165 ? .map ((call) => call.toSyntax (context))
153166 .toList (),
@@ -161,6 +174,13 @@ Error: $e
161174 return RecordedUsesSyntax (
162175 metadata: metadata.toSyntax (),
163176 constants: constantSyntax.isEmpty ? null : constantSyntax,
177+ definitions: context.definitions.isEmpty
178+ ? null
179+ : context.definitions.keys
180+ .map (
181+ (definition) => definition.toSyntax (),
182+ )
183+ .toList (),
164184 recordings: recordings.isEmpty ? null : recordings,
165185 );
166186 }
@@ -204,11 +224,27 @@ Error: $e
204224 ),
205225 }.flatten ().toList ();
206226
227+ DefinitionSerializationContext _serializeDefinitions (
228+ List <Constant > allConstants,
229+ ) {
230+ final allDefinitions = {
231+ ...calls.keys,
232+ ...instances.keys,
233+ }.toList ();
234+ return DefinitionSerializationContext (
235+ allDefinitions.asMapToIndices,
236+ );
237+ }
238+
207239 (SerializationContext , List <ConstantSyntax >) _serializeConstants (
208240 List <Constant > allConstants,
241+ DefinitionSerializationContext definitionContext,
209242 ) {
210243 final constantsMap = allConstants.asMapToIndices;
211- final context = SerializationContext (constantsMap);
244+ final context = SerializationContext .fromPrevious (
245+ definitionContext,
246+ constantsMap,
247+ );
212248 final constantSyntax = [
213249 for (final constant in allConstants) constant.toSyntax (context),
214250 ];
0 commit comments