Headers.fromEntries: using CaseInsensitiveMap.fromEntries

pkgs/shelf/CHANGELOG.md

@@ -1,5 +1,7 @@
-## 1.4.2-wip
+## 1.4.2
 
+* `Headers`: added the `fromEntries`  constructor.
+* Require `http_parser`: ^4.1.0
 * Require Dart `^3.3.0`.
 
 ## 1.4.1

pkgs/shelf/lib/src/headers.dart

@@ -23,15 +23,24 @@ class Headers extends UnmodifiableMapView<String, List<String>> {
       return _emptyHeaders;
     } else if (values is Headers) {
       return values;
+    } else {
+      return Headers._(values.entries);
+    }
+  }
+
+  factory Headers.fromEntries(
+      Iterable<MapEntry<String, List<String>>>? values) {
+    if (values == null || (values is List && values.isEmpty)) {
+      return _emptyHeaders;
     } else {
       return Headers._(values);
     }
   }
 
-  Headers._(Map<String, List<String>> values)
-      : super(CaseInsensitiveMap.from(Map.fromEntries(values.entries
+  Headers._(Iterable<MapEntry<String, List<String>>> entries)
+      : super(CaseInsensitiveMap.fromEntries(entries
             .where((e) => e.value.isNotEmpty)
-            .map((e) => MapEntry(e.key, List.unmodifiable(e.value))))));
+            .map((e) => MapEntry(e.key, List.unmodifiable(e.value)))));
 
   Headers._empty() : super(const {});
 

pkgs/shelf/pubspec.yaml

@@ -1,5 +1,5 @@
 name: shelf
-version: 1.4.2-wip
+version: 1.4.2
 description: >
   A model for web server middleware that encourages composition and easy reuse.
 repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf
@@ -15,7 +15,7 @@ environment:
 dependencies:
   async: ^2.5.0
   collection: ^1.15.0
-  http_parser: ^4.0.0
+  http_parser: ^4.1.0
   path: ^1.8.0
   stack_trace: ^1.10.0
   stream_channel: ^2.1.0

pkgs/shelf/test/headers_test.dart

@@ -0,0 +1,28 @@
+import 'package:shelf/src/headers.dart';
+import 'package:test/test.dart';
+
+void main() {
+  test('Headers.from', () {
+    var header = Headers.from({
+      'FoO': ['x', 'y'],
+      'bAr': ['z'],
+    });
+
+    expect(header['foo'], equals(['x', 'y']));
+    expect(header['BAR'], equals(['z']));
+
+    expect(() => header['X'] = ['x'], throwsA(isA<UnsupportedError>()));
+  });
+
+  test('Headers.fromEntries', () {
+    var header = Headers.fromEntries({
+      'FoO': ['x', 'y'],
+      'bAr': ['z'],
+    }.entries);
+
+    expect(header['foo'], equals(['x', 'y']));
+    expect(header['BAR'], equals(['z']));
+
+    expect(() => header['X'] = ['x'], throwsA(isA<UnsupportedError>()));
+  });
+}