Skip to content

Commit 258d382

Browse files
authored
[record_use] Simplify Metadata (dart-lang#3145)
1 parent 37f263c commit 258d382

6 files changed

Lines changed: 10 additions & 11 deletions

File tree

‎pkgs/record_use/lib/record_use_internal.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,3 @@ export 'src/reference.dart'
3434
InstanceConstantReference,
3535
InstanceCreationReference,
3636
InstanceReference;
37-
export 'src/version.dart' show version;

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

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

77
import 'helper.dart';
88
import 'syntax.g.dart';
9+
import 'version.dart';
910

1011
/// Metadata attached to a recorded usages file.
1112
///
@@ -18,10 +19,12 @@ class Metadata {
1819
const Metadata._(this._syntax);
1920

2021
factory Metadata({
21-
required Version version,
22-
required String comment,
22+
Version? version,
23+
String comment =
24+
'Recorded usages of objects tagged with a `RecordUse` annotation.',
2325
Map<String, Object?>? extension,
2426
}) {
27+
version ??= versionInternal;
2528
final syntax = MetadataSyntax(
2629
comment: comment,
2730
version: version.toString(),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ class Recordings {
3636
final Map<Definition, List<InstanceReference>> instances;
3737

3838
Recordings({
39-
required this.metadata,
39+
Metadata? metadata,
4040
required this.calls,
4141
required this.instances,
42-
});
42+
}) : metadata = metadata ?? Metadata();
4343

4444
/// Decodes a JSON representation into a [Recordings] object.
4545
///

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ import 'package:pub_semver/pub_semver.dart' show Version;
77
// TODO: Delete this version number. Instead of relying on versions, we want to
88
// lazy read JSONs so that we don't break on versions that might be
99
// incompatible but we don't access any of the incompatible fields.
10-
final version = Version(0, 4, 0);
10+
final versionInternal = Version(0, 4, 0);

‎pkgs/record_use/test/extension_receiver_test.dart‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ void main() {
5555
test('Call with receiver serialization round-trip', () {
5656
const definition = Definition('package:a/a.dart', [Name('foo')]);
5757
final recordings = Recordings(
58-
metadata: Metadata(version: version, comment: 'test'),
5958
calls: {
6059
definition: [
6160
const CallWithArguments(
@@ -87,7 +86,6 @@ void main() {
8786
test('CallTearoff with receiver serialization round-trip', () {
8887
const definition = Definition('package:a/a.dart', [Name('foo')]);
8988
final recordings = Recordings(
90-
metadata: Metadata(version: version, comment: 'test'),
9189
calls: {
9290
definition: [
9391
const CallTearoff(

‎pkgs/record_use/test/maybe_constant_test.dart‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ void main() {
6969
test('MaybeConstant serialization round-trip', () {
7070
const definition = Definition('package:a/a.dart', [Name('foo')]);
7171
final recordings = Recordings(
72-
metadata: Metadata(version: version, comment: 'test'),
7372
calls: {
7473
definition: [
7574
const CallWithArguments(
@@ -135,7 +134,7 @@ void main() {
135134
const definition = Definition('package:a/a.dart', [Name('foo')]);
136135

137136
final actualRecordings = Recordings(
138-
metadata: Metadata(version: version, comment: 'actual'),
137+
metadata: Metadata(comment: 'actual'),
139138
calls: {
140139
definition: [
141140
const CallWithArguments(
@@ -149,7 +148,7 @@ void main() {
149148
);
150149

151150
final expectedRecordings = Recordings(
152-
metadata: Metadata(version: version, comment: 'expected'),
151+
metadata: Metadata(comment: 'expected'),
153152
calls: {
154153
definition: [
155154
const CallWithArguments(

0 commit comments

Comments
 (0)