Merge pull request #1 from matthewnitschke/ci_implementation

CI Implementation

Author: matthewnitschke

.tool-versions

@@ -0,0 +1 @@
+dart 2.14.4

README.md

@@ -1,3 +1,6 @@
+[![Dart](https://github.com/matthewnitschke/pubspec_lock_parse/actions/workflows/dart.yml/badge.svg)](https://github.com/matthewnitschke/pubspec_lock_parse/actions/workflows/dart.yml)
+[![pub package](https://img.shields.io/pub/v/pubspec_lock_parse.svg)](https://pub.dev/packages/pubspec_lock_parse)
+
 Supports parsing `pubspec.lock` files with robust error reporting
 
 Designed around the [`pubspec_parse`](https://github.com/dart-lang/pubspec_parse) package, and mirrors its implementation and interface

lib/src/package.dart

@@ -5,10 +5,10 @@ import 'package:pub_semver/pub_semver.dart';
 part 'package.g.dart';
 
 Map<String, Package> parsePackages(Map source) =>
-  source?.map((k, v) {
+  source.map((k, v) {
     final value = v as Map;
     return MapEntry(k, Package.fromJson(value));
-  }) ?? {};
+  });
 
 @JsonSerializable()
 class Package {
@@ -23,10 +23,10 @@ class Package {
   final Version version;
 
   Package({
-    this.dependency,
-    this.description,
-    this.source,
-    this.version,
+    required this.dependency,
+    required this.description,
+    required this.source,
+    required this.version,
   });
 
   factory Package.fromJson(Map json) => _$PackageFromJson(json);
@@ -40,5 +40,4 @@ enum PackageSource {
 
 // ---------------------------------- Parsers ----------------------------------
 
-Version _versionFromString(String input) =>
-    input == null ? null : Version.parse(input);
+Version _versionFromString(String input) => Version.parse(input);

lib/src/package.g.dart

@@ -13,6 +13,8 @@ PackageDescription parsePackageDescription(Object data) {
       return HostedPackageDescription.fromJson(data);
     }
   }
+
+  throw FormatException('Unknown package description type');
 }
 
 abstract class PackageDescription { }
@@ -23,7 +25,10 @@ class HostedPackageDescription extends PackageDescription {
 
   final String url;
 
-  HostedPackageDescription({ this.name, this.url });
+  HostedPackageDescription({ 
+    required this.name, 
+    required this.url,
+  });
 
   factory HostedPackageDescription.fromJson(Map json) => _$HostedPackageDescriptionFromJson(json);
 }
@@ -39,7 +44,12 @@ class GitPackageDescription extends PackageDescription {
 
   final String url;
 
-  GitPackageDescription({ this.path, this.ref, this.resolvedRef, this.url });
+  GitPackageDescription({ 
+    required this.path,
+    required this.ref, 
+    required this.resolvedRef, 
+    required this.url, 
+  });
 
   factory GitPackageDescription.fromJson(Map json) => _$GitPackageDescriptionFromJson(json);
 }
@@ -50,7 +60,10 @@ class PathPackageDescription extends PackageDescription {
 
   final bool relative;
 
-  PathPackageDescription({ this.path, this.relative });
+  PathPackageDescription({ 
+    required this.path,
+    required this.relative,
+  });
 
   factory PathPackageDescription.fromJson(Map json) => _$PathPackageDescriptionFromJson(json);
 }

lib/src/package_description.dart

@@ -15,24 +15,22 @@ class PubspecLock {
   final Map<String, VersionConstraint> sdks;
 
   PubspecLock({
-    this.packages,
-    this.sdks,
+    required this.packages,
+    required this.sdks,
   });
 
   factory PubspecLock.fromJson(Map json) => _$PubspecLockFromJson(json);
 
-  factory PubspecLock.parse(String yaml, {Uri sourceUrl}) =>
+  factory PubspecLock.parse(String yaml, {Uri? sourceUrl}) =>
     checkedYamlDecode(
       yaml,
-      (map) => PubspecLock.fromJson(map),
+      (map) => PubspecLock.fromJson(map ?? {}),
       sourceUrl: sourceUrl
     );
 }
 
 // ---------------------------------- Parsers ----------------------------------
 
-Map<String, VersionConstraint> _parseSdks(Map source) =>
-  source?.map((k, v) => MapEntry(k, _versionConstraintFromString(v as String))) ?? {};
+Map<String, VersionConstraint> _parseSdks(Map source) => source.map((k, v) => MapEntry(k, _versionConstraintFromString(v as String)));
 
-VersionConstraint _versionConstraintFromString(String input) =>
-    input == null ? null : VersionConstraint.parse(input);
+VersionConstraint _versionConstraintFromString(String input) => VersionConstraint.parse(input);

lib/src/package_description.g.dart

@@ -4,16 +4,16 @@ description: Simple package for parsing pubspec.lock files with a type-safe API
 repository: https://github.com/matthewnitschke/pubspec_lock_parse
 
 environment:
-  sdk: '>=2.7.0 <3.0.0'
+  sdk: '>=2.14.0 <3.0.0'
 
 dependencies:
-  args: ^1.6.0
-  json_annotation: ^3.1.1
-  pub_semver: ^1.4.4
-  checked_yaml: ^1.0.4
+  args: ^2.3.0
+  json_annotation: ^4.3.0
+  pub_semver: ^2.1.0
+  checked_yaml: ^2.0.1
 
 dev_dependencies:
   build_runner: ^1.10.1
-  json_serializable: ^3.5.1
+  json_serializable: ^6.0.1
   test: ^1.15.7
   stack_trace: ^1.9.2

lib/src/pubspec_lock.dart

@@ -8,7 +8,7 @@ void main() {
   test('minimal set values', () {
     final value = parse(defaultPubspecLock);
     expect(value.packages, isEmpty);
-    expect(value.sdks, VersionConstraint.parse('>=2.7.0 <3.0.0'));
+    expect(value.sdks['dart'], VersionConstraint.parse('>=2.7.0 <3.0.0'));
   });
 
   group('package types -', () {
@@ -25,7 +25,7 @@ void main() {
       });
 
 
-      final package = value.packages['package_a'];
+      final package = value.packages['package_a']!;
       expect(package.dependency, 'transitive');
       expect(package.description is HostedPackageDescription, isTrue);
       expect(package.version, Version.parse('1.2.3'));
@@ -50,7 +50,7 @@ void main() {
         }
       });
 
-      final package = value.packages['package_a'];
+      final package = value.packages['package_a']!;
       expect(package.dependency, 'transitive');
       expect(package.description is GitPackageDescription, isTrue);
       expect(package.version, Version.parse('1.2.3'));
@@ -75,7 +75,7 @@ void main() {
         }
       });
 
-      final package = value.packages['package_a'];
+      final package = value.packages['package_a']!;
       expect(package.dependency, 'direct');
       expect(package.description is PathPackageDescription, isTrue);
       expect(package.version, Version.parse('1.2.3'));