Handle tag_pattern in git dependencies

pkgs/pubspec_parse/lib/src/dependency.dart

@@ -75,7 +75,7 @@ Dependency? _fromJson(Object? data, String name) {
         final key = matchedKeys.single;
 
         return switch (key) {
-          'git' => GitDependency.fromData(data[key]),
+          'git' => GitDependency.fromJson(data),
           'path' => PathDependency.fromData(data[key]),
           'sdk' => _$SdkDependencyFromJson(data),
           'hosted' => _$HostedDependencyFromJson(data)
@@ -118,19 +118,56 @@ class GitDependency extends Dependency {
   final Uri url;
   final String? ref;
   final String? path;
-
-  GitDependency(this.url, {this.ref, this.path});
-
-  factory GitDependency.fromData(Object? data) {
-    if (data is String) {
-      data = {'url': data};
-    }
-
-    if (data is Map) {
-      return _$GitDependencyFromJson(data);
-    }
-
-    throw ArgumentError.value(data, 'git', 'Must be a String or a Map.');
+  final String? tagPattern;
+  final VersionConstraint? version;
+
+  GitDependency(this.url, {this.ref, this.path, this.tagPattern, this.version});
+
+  factory GitDependency.fromJson(Map data) {
+    final version = switch (data['version']) {
+      final String? s => _constraintFromString(s),
+      _ => null,
+    };
+    final gitData = switch (data['git']) {
+      final String s => {'url': s},
+      final Map m => m,
+      _ => throw ArgumentError.value(
+          data['git'],
+          'git',
+          'Must be a string or map.',
+        ),
+    };
+    final url = switch (gitData['url']) {
+      final String s => parseGitUri(s),
+      _ =>
+        throw ArgumentError.value(gitData['url'], 'url', 'Must be a String.'),
+    };
+    final ref = switch (gitData['ref']) {
+      final String? s => s,
+      _ =>
+        throw ArgumentError.value(gitData['ref'], 'ref', 'Must be a String.'),
+    };
+    final path = switch (gitData['path']) {
+      final String? s => s,
+      _ =>
+        throw ArgumentError.value(gitData['path'], 'path', 'Must be a String.'),
+    };
+    final tagPattern = switch (gitData['tag_pattern']) {
+      final String? s => s,
+      _ => throw ArgumentError.value(
+          gitData['tagPattern'],
+          'tagPattern',
+          'Must be a String.',
+        ),
+    };
+
+    return GitDependency(
+      url,
+      ref: ref,
+      path: path,
+      tagPattern: tagPattern,
+      version: version,
+    );
   }
 
   @override

pkgs/pubspec_parse/test/dependency_test.dart

@@ -258,6 +258,22 @@ void _gitDependency() {
     expect(dep.toString(), 'GitDependency: url@url');
   });
 
+  test('tag_pattern works, and does not ignore version', () async {
+    final dep = await _dependency<GitDependency>({
+      'git': {
+        'url': 'url',
+        'tag_pattern': 'v{{v}}',
+      },
+      'version': '^1.2.3',
+    });
+    expect(dep.url.toString(), 'url');
+    expect(dep.path, isNull);
+    expect(dep.ref, isNull);
+    expect(dep.tagPattern, 'v{{v}}');
+    expect(dep.version.toString(), '^1.2.3');
+    expect(dep.toString(), 'GitDependency: url@url');
+  });
+
   test('string with user@ URL', () async {
     final skipTryParse = Platform.environment.containsKey('TRAVIS');
     if (skipTryParse) {
@@ -299,7 +315,7 @@ line 6, column 4: Unrecognized keys: [bob]; supported keys: [sdk, git, path, hos
     _expectThrows(
       {'git': null},
       r'''
-line 5, column 11: Unsupported value for "git". Must be a String or a Map.
+line 5, column 11: Unsupported value for "git". Must be a string or map.
   ╷
 5 │      "git": null
   │ ┌───────────^
@@ -313,7 +329,7 @@ line 5, column 11: Unsupported value for "git". Must be a String or a Map.
     _expectThrows(
       {'git': 42},
       r'''
-line 5, column 11: Unsupported value for "git". Must be a String or a Map.
+line 5, column 11: Unsupported value for "git". Must be a string or map.
   ╷
 5 │      "git": 42
   │ ┌───────────^
@@ -326,7 +342,7 @@ line 5, column 11: Unsupported value for "git". Must be a String or a Map.
   test('git - empty map', () {
     _expectThrowsContaining(
       {'git': <String, dynamic>{}},
-      r"type 'Null' is not a subtype of type 'String'",
+      r'Missing key "url". Must be a String',
     );
   });
 
@@ -335,7 +351,7 @@ line 5, column 11: Unsupported value for "git". Must be a String or a Map.
       {
         'git': {'url': null},
       },
-      r"type 'Null' is not a subtype of type 'String'",
+      r'Missing key "url". Must be a String',
     );
   });
 
@@ -344,7 +360,7 @@ line 5, column 11: Unsupported value for "git". Must be a String or a Map.
       {
         'git': {'url': 42},
       },
-      r"type 'int' is not a subtype of type 'String'",
+      r'Missing key "url". Must be a String',
     );
   });
 }