Unify on one analysis_options file (#280)

Apply fixes to shelf_router and shelf_router_generator

Author: kevmoo

analysis_options.yaml

@@ -10,43 +10,30 @@ linter:
   rules:
     - always_declare_return_types
     - avoid_unused_constructor_parameters
-    - await_only_futures
-    - camel_case_types
     - cancel_subscriptions
-    - constant_identifier_names
-    - control_flow_in_finally
     - depend_on_referenced_packages
     - directives_ordering
-    - empty_statements
-    - hash_and_equals
-    - implementation_imports
-    - iterable_contains_unrelated_type
     - library_private_types_in_public_api
     - lines_longer_than_80_chars
-    - list_remove_unrelated_type
     - literal_only_boolean_expressions
     - missing_whitespace_between_adjacent_strings
     - no_adjacent_strings_in_list
     - no_leading_underscores_for_library_prefixes
     - no_leading_underscores_for_local_identifiers
     - no_runtimeType_toString
-    - non_constant_identifier_names
     - null_check_on_nullable_type_parameter
     - omit_local_variable_types
-    - overridden_fields
     - package_api_docs
-    - package_names
-    - package_prefixed_library_names
     - prefer_relative_imports
     - prefer_single_quotes
     - test_types_in_equals
     - throw_in_finally
     - type_annotate_public_apis
     - unawaited_futures
     - unnecessary_await_in_return
-    - unnecessary_brace_in_string_interps
     - unnecessary_constructor_name
     - unnecessary_lambdas
     - unnecessary_late
     - unnecessary_null_aware_assignments
     - unnecessary_nullable_for_final_variable_declarations
+    - use_super_parameters

pkgs/shelf_router/analysis_options.yaml

@@ -13,9 +13,10 @@
 // limitations under the License.
 
 import 'dart:async' show Future;
-import 'package:shelf_router/shelf_router.dart';
+
 import 'package:shelf/shelf.dart';
 import 'package:shelf/shelf_io.dart' as shelf_io;
+import 'package:shelf_router/shelf_router.dart';
 
 class Service {
   // The [Router] can be used to create a handler, which can be used with
@@ -39,7 +40,7 @@ class Service {
 
     // Handlers can be asynchronous (returning `FutureOr` is also allowed).
     router.get('/wave', (Request request) async {
-      await Future.delayed(Duration(milliseconds: 100));
+      await Future<void>.delayed(Duration(milliseconds: 100));
       return Response.ok('_o/');
     });
 

pkgs/shelf_router/example/main.dart

@@ -76,10 +76,10 @@
 ///   await io.serve(service.router.handler, 'localhost', 8080);
 /// }
 /// ```
-///
 library shelf_router;
 
-import 'package:shelf_router/src/router.dart';
-import 'package:shelf_router/src/route.dart';
-export 'package:shelf_router/src/router.dart';
+import 'src/route.dart';
+import 'src/router.dart';
+
 export 'package:shelf_router/src/route.dart';
+export 'package:shelf_router/src/router.dart';

pkgs/shelf_router/lib/shelf_router.dart

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import 'package:meta/meta.dart' show sealed;
-import 'package:shelf_router/src/router.dart';
+import 'router.dart';
 
 /// Annotation for handler methods that requests should be routed when using
 /// package `shelf_router_generator`.

pkgs/shelf_router/lib/src/route.dart

@@ -18,7 +18,8 @@ import 'dart:convert';
 import 'package:http_methods/http_methods.dart';
 import 'package:meta/meta.dart' show sealed;
 import 'package:shelf/shelf.dart';
-import 'package:shelf_router/src/router_entry.dart' show RouterEntry;
+
+import 'router_entry.dart' show RouterEntry;
 
 /// Get a URL parameter captured by the [Router].
 @Deprecated('Use Request.params instead')
@@ -294,7 +295,7 @@ class _RouteNotFoundResponse extends Response {
   Response change({
     Map<String, /* String | List<String> */ Object?>? headers,
     Map<String, Object?>? context,
-    body,
+    Object? body,
   }) {
     return super.change(
       headers: headers,

pkgs/shelf_router/lib/src/router.dart

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import 'dart:async';
+
 import 'package:shelf/shelf.dart';
 
 /// Check if the [regexp] is non-capturing.
@@ -102,12 +103,12 @@ class RouterEntry {
 
     return await _middleware((request) async {
       if (_handler is Handler || _params.isEmpty) {
-        return await _handler(request);
+        return await _handler(request) as Response;
       }
       return await Function.apply(_handler, [
         request,
         ..._params.map((n) => params[n]),
-      ]);
+      ]) as Response;
     })(request);
   }
 }

pkgs/shelf_router/lib/src/router_entry.dart

@@ -38,7 +38,7 @@ class Service {
   // Handlers can be asynchronous (returning `FutureOr` is also allowed).
   @Route.get('/wave')
   Future<Response> _wave(Request request) async {
-    await Future.delayed(const Duration(milliseconds: 100));
+    await Future<void>.delayed(const Duration(milliseconds: 100));
     return Response.ok('_o/');
   }
 

pkgs/shelf_router_generator/analysis_options.yaml

@@ -29,7 +29,7 @@ class Service {
 
   @Route.get('/wave')
   FutureOr<Response> _wave(Request request) async {
-    await Future.delayed(const Duration(milliseconds: 50));
+    await Future<void>.delayed(const Duration(milliseconds: 50));
     return Response.ok('_o/');
   }