Remove ResourceCollection

Author: f3ath

lib/document.dart

@@ -11,5 +11,4 @@ export 'package:json_api/src/document/one.dart';
 export 'package:json_api/src/document/outbound_document.dart';
 export 'package:json_api/src/document/relationship.dart';
 export 'package:json_api/src/document/resource.dart';
-export 'package:json_api/src/document/resource_collection.dart';
 export 'package:json_api/src/document/resource_properties.dart';

lib/query.dart

@@ -5,6 +5,6 @@ export 'package:json_api/src/query/fields.dart';
 export 'package:json_api/src/query/filter.dart';
 export 'package:json_api/src/query/include.dart';
 export 'package:json_api/src/query/page.dart';
-export 'package:json_api/src/query/sort.dart';
 export 'package:json_api/src/query/query.dart';
 export 'package:json_api/src/query/query_encodable.dart';
+export 'package:json_api/src/query/sort.dart';

lib/src/client/response/collection_fetched.dart

@@ -13,10 +13,10 @@ class CollectionFetched {
   final HttpResponse http;
 
   /// The resource collection fetched from the server
-  final collection = ResourceCollection();
+  final collection = <Resource>[];
 
   /// Included resources
-  final included = ResourceCollection();
+  final included = <Resource>[];
 
   /// Top-level meta data
   final meta = <String, Object?>{};

lib/src/client/response/related_resource_fetched.dart

@@ -19,7 +19,7 @@ class RelatedResourceFetched {
   final Resource? resource;
 
   /// Included resources
-  final included = ResourceCollection();
+  final included = <Resource>[];
 
   /// Top-level meta data
   final meta = <String, Object?>{};

lib/src/client/response/relationship_fetched.dart

@@ -15,5 +15,5 @@ class RelationshipFetched<R extends Relationship> {
 
   final HttpResponse http;
   final R relationship;
-  final included = ResourceCollection();
+  final included = <Resource>[];
 }

lib/src/client/response/resource_created.dart

@@ -25,5 +25,5 @@ class ResourceCreated {
   final links = <String, Link>{};
 
   /// Included resources
-  final included = ResourceCollection();
+  final included = <Resource>[];
 }

lib/src/client/response/resource_fetched.dart

@@ -20,5 +20,5 @@ class ResourceFetched {
   final links = <String, Link>{};
 
   /// Included resources
-  final included = ResourceCollection();
+  final included = <Resource>[];
 }

lib/src/client/response/resource_updated.dart

@@ -32,5 +32,5 @@ class ResourceUpdated {
   final links = <String, Link>{};
 
   /// Included resources
-  final included = ResourceCollection();
+  final included = <Resource>[];
 }

lib/src/document/resource.dart

@@ -6,6 +6,7 @@ class Resource with ResourceProperties {
 
   final String type;
   final String id;
+
   String get key => '$type:$id';
 
   /// Resource links

lib/src/document/resource_collection.dart

@@ -2,7 +2,6 @@ import 'dart:collection';
 
 import 'package:json_api/src/query/query_encodable.dart';
 
-
 /// Query parameters defining Sparse Fieldsets
 /// @see https://jsonapi.org/format/#fetching-sparse-fieldsets
 class Fields with MapMixin<String, Iterable<String>> implements QueryEncodable {

lib/src/query/fields.dart

@@ -55,9 +55,10 @@ void main() {
       final fetchedPost = response.collection.first;
       expect(fetchedPost.attributes['title'], 'Hello world');
 
-      final fetchedAuthor =
-          response.included[fetchedPost.one('author')?.identifier?.key];
-      expect(fetchedAuthor?.attributes['name'], 'Alice');
+      final fetchedAuthor = response.included
+          .where(fetchedPost.one('author')!.identifier!.identifies)
+          .single;
+      expect(fetchedAuthor.attributes['name'], 'Alice');
 
       final fetchedComment =
           find(fetchedPost.many('comments')!, response.included).single;
@@ -121,8 +122,10 @@ void main() {
         Include(['author'])
       ]).then((r) {
         expect(
-            r.included[r.resource.one('author')?.identifier?.key]
-                ?.attributes['name'],
+            r.included
+                .where(r.resource.one('author')!.identifier!.identifies)
+                .single
+                .attributes['name'],
             'Bob');
       });
     });
@@ -179,6 +182,6 @@ void main() {
 /// Finds the referenced elements which are found in the [collection].
 /// The resulting [Iterable] may contain fewer elements than referred by the
 /// relationship if the [collection] does not have all of them.
-Iterable<Resource> find(ToMany many, ResourceCollection collection) =>
+Iterable<Resource> find(ToMany many, Iterable<Resource> collection) =>
     collection.where((resource) =>
         many.any((identifier) => identifier.identifies(resource)));

test/contract/crud_test.dart

@@ -53,7 +53,10 @@ void main() {
             'articles': ['title', 'body'],
             'people': ['name']
           }).toQuery(),
-          {'fields[articles]': ['title,body'], 'fields[people]': ['name']});
+          {
+            'fields[articles]': ['title,body'],
+            'fields[people]': ['name']
+          });
     });
   });
 }

test/unit/query/fields_test.dart

@@ -30,8 +30,10 @@ void main() {
     });
 
     test('Can convert to query parameters', () {
-      expect(Filter({'post': '1,2', 'author': '12'}).toQuery(),
-          {'filter[post]': ['1,2'], 'filter[author]': ['12']});
+      expect(Filter({'post': '1,2', 'author': '12'}).toQuery(), {
+        'filter[post]': ['1,2'],
+        'filter[author]': ['12']
+      });
     });
   });
 }

test/unit/query/filter_test.dart

@@ -30,8 +30,10 @@ void main() {
     });
 
     test('can convert to query parameters', () {
-      expect(Page({'limit': '10', 'offset': '20'}).toQuery(),
-          {'page[limit]': ['10'], 'page[offset]': ['20']});
+      expect(Page({'limit': '10', 'offset': '20'}).toQuery(), {
+        'page[limit]': ['10'],
+        'page[offset]': ['20']
+      });
     });
   });
 }

test/unit/query/page_test.dart

@@ -26,7 +26,8 @@ void main() {
   });
 
   test('Can convert to query parameters', () {
-    expect(Sort(['-created', 'title']).toQuery(),
-        {'sort': ['-created,title']});
+    expect(Sort(['-created', 'title']).toQuery(), {
+      'sort': ['-created,title']
+    });
   });
 }