chore(deps): upgrade very good analysis (#372)

renancaraujo · web-flow · commit 9f1732bc2489 · 2022-10-14T14:22:27.000-05:00
diff --git a/bricks/create_dart_frog/hooks/analysis_options.yaml b/bricks/create_dart_frog/hooks/analysis_options.yaml
@@ -1 +1 @@
-include: package:very_good_analysis/analysis_options.3.0.1.yaml
+include: package:very_good_analysis/analysis_options.3.1.0.yaml
diff --git a/bricks/create_dart_frog/hooks/pubspec.yaml b/bricks/create_dart_frog/hooks/pubspec.yaml
@@ -1,7 +1,7 @@
 name: create_dart_frog_hooks
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.18.0 <3.0.0"
 
 dependencies:
   mason: ^0.1.0-dev.31
@@ -10,4 +10,4 @@ dependencies:
 dev_dependencies:
   mocktail: ^0.3.0
   test: ^1.19.2
-  very_good_analysis: ^3.0.1
+  very_good_analysis: ^3.1.0
diff --git a/bricks/dart_frog_dev_server/hooks/analysis_options.yaml b/bricks/dart_frog_dev_server/hooks/analysis_options.yaml
@@ -1 +1 @@
-include: package:very_good_analysis/analysis_options.3.0.1.yaml
+include: package:very_good_analysis/analysis_options.3.1.0.yaml
diff --git a/bricks/dart_frog_dev_server/hooks/pre_gen.dart b/bricks/dart_frog_dev_server/hooks/pre_gen.dart
@@ -10,20 +10,21 @@ typedef RouteConfigurationBuilder = RouteConfiguration Function(
   io.Directory directory,
 );
 
+void _defaultExit(int code) => ExitOverrides.current?.exit ?? io.exit;
+
 Future<void> run(HookContext context) async => preGen(context);
 
 Future<void> preGen(
   HookContext context, {
   RouteConfigurationBuilder buildConfiguration = buildRouteConfiguration,
-  void Function(int exitCode)? exit,
+  void Function(int exitCode) exit = _defaultExit,
 }) async {
   final RouteConfiguration configuration;
   try {
     configuration = buildConfiguration(io.Directory.current);
   } catch (error) {
     context.logger.err('$error');
-    final _exit = exit ?? ExitOverrides.current?.exit ?? io.exit;
-    return _exit(1);
+    return exit(1);
   }
 
   reportRouteConflicts(context, configuration);
diff --git a/bricks/dart_frog_dev_server/hooks/pubspec.yaml b/bricks/dart_frog_dev_server/hooks/pubspec.yaml
@@ -2,7 +2,7 @@ name: dart_frog_dev_server_hooks
 publish_to: none
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.18.0 <3.0.0"
 
 dependencies:
   dart_frog_gen: ^0.1.0
@@ -13,4 +13,4 @@ dev_dependencies:
   mocktail: ^0.3.0
   path: ^1.8.2
   test: ^1.19.2
-  very_good_analysis: ^3.0.1
+  very_good_analysis: ^3.1.0
diff --git a/bricks/dart_frog_prod_server/hooks/analysis_options.yaml b/bricks/dart_frog_prod_server/hooks/analysis_options.yaml
@@ -1 +1 @@
-include: package:very_good_analysis/analysis_options.3.0.1.yaml
+include: package:very_good_analysis/analysis_options.3.1.0.yaml
diff --git a/bricks/dart_frog_prod_server/hooks/post_gen.dart b/bricks/dart_frog_prod_server/hooks/post_gen.dart
@@ -11,23 +11,24 @@ typedef ProcessRunner = Future<io.ProcessResult> Function(
   bool runInShell,
 });
 
+void _defaultExit(int code) => ExitOverrides.current?.exit ?? io.exit;
+
 Future<void> run(HookContext context) => postGen(context);
 
 Future<void> postGen(
   HookContext context, {
   io.Directory? directory,
   ProcessRunner runProcess = io.Process.run,
-  void Function(int exitCode)? exit,
+  void Function(int exitCode) exit = _defaultExit,
 }) async {
-  final _exit = exit ?? ExitOverrides.current?.exit ?? io.exit;
-  final _directory = directory ?? io.Directory.current;
-  final buildDirectoryPath = path.join(_directory.path, 'build');
+  final projectDirectory = directory ?? io.Directory.current;
+  final buildDirectoryPath = path.join(projectDirectory.path, 'build');
 
   await dartPubGet(
     context,
     workingDirectory: buildDirectoryPath,
     runProcess: runProcess,
-    exit: _exit,
+    exit: exit,
   );
 
   final relativeBuildPath = path.relative(buildDirectoryPath);
diff --git a/bricks/dart_frog_prod_server/hooks/pre_gen.dart b/bricks/dart_frog_prod_server/hooks/pre_gen.dart
@@ -11,30 +11,31 @@ typedef RouteConfigurationBuilder = RouteConfiguration Function(
   io.Directory directory,
 );
 
+void _defaultExit(int code) => ExitOverrides.current?.exit ?? io.exit;
+
 Future<void> run(HookContext context) => preGen(context);
 
 Future<void> preGen(
   HookContext context, {
   io.Directory? directory,
   RouteConfigurationBuilder buildConfiguration = buildRouteConfiguration,
-  void Function(int exitCode)? exit,
+  void Function(int exitCode) exit = _defaultExit,
 }) async {
-  final _exit = exit ?? ExitOverrides.current?.exit ?? io.exit;
   final projectDirectory = directory ?? io.Directory.current;
 
-  await createBundle(context, projectDirectory, _exit);
+  await createBundle(context, projectDirectory, exit);
 
   final RouteConfiguration configuration;
   try {
     configuration = buildConfiguration(projectDirectory);
   } catch (error) {
     context.logger.err('$error');
-    return _exit(1);
+    return exit(1);
   }
 
-  reportRouteConflicts(context, configuration, _exit);
-  reportRogueRoutes(context, configuration, _exit);
-  await reportExternalPathDependencies(context, projectDirectory, _exit);
+  reportRouteConflicts(context, configuration, exit);
+  reportRogueRoutes(context, configuration, exit);
+  await reportExternalPathDependencies(context, projectDirectory, exit);
 
   context.vars = {
     'directories': configuration.directories
diff --git a/bricks/dart_frog_prod_server/hooks/pubspec.yaml b/bricks/dart_frog_prod_server/hooks/pubspec.yaml
@@ -2,7 +2,7 @@ name: dart_frog_prod_server_hooks
 publish_to: none
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.18.0 <3.0.0"
 
 dependencies:
   dart_frog_gen: ^0.1.0
@@ -14,4 +14,4 @@ dependencies:
 dev_dependencies:
   mocktail: ^0.3.0
   test: ^1.19.2
-  very_good_analysis: ^3.0.1
+  very_good_analysis: ^3.1.0
diff --git a/docs/docs/tutorials/todos.md b/docs/docs/tutorials/todos.md
@@ -178,7 +178,7 @@ dev_dependencies:
   json_serializable: ^6.3.1
   mocktail: ^0.3.0
   test: ^1.19.2
-  very_good_analysis: ^3.0.1
+  very_good_analysis: ^3.1.0
 ```
 
 Install the newly added dependencies via:
@@ -377,7 +377,7 @@ dependencies:
 dev_dependencies:
   mocktail: ^0.3.0
   test: ^1.19.2
-  very_good_analysis: ^3.0.1
+  very_good_analysis: ^3.1.0
 ```
 
 :::note
@@ -456,7 +456,7 @@ dependencies:
 dev_dependencies:
   mocktail: ^0.3.0
   test: ^1.19.2
-  very_good_analysis: ^3.0.1
+  very_good_analysis: ^3.1.0
 ```
 
 Install the newly added dependencies via:
diff --git a/examples/counter/analysis_options.yaml b/examples/counter/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: package:very_good_analysis/analysis_options.3.0.1.yaml
+include: package:very_good_analysis/analysis_options.3.1.0.yaml
 analyzer:
   exclude:
     - build/**
diff --git a/examples/counter/pubspec.yaml b/examples/counter/pubspec.yaml
@@ -13,4 +13,4 @@ dev_dependencies:
   http: ^0.13.5
   mocktail: ^0.3.0
   test: ^1.19.2
-  very_good_analysis: ^3.0.1
+  very_good_analysis: ^3.1.0
diff --git a/examples/echo/analysis_options.yaml b/examples/echo/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: package:very_good_analysis/analysis_options.3.0.1.yaml
+include: package:very_good_analysis/analysis_options.3.1.0.yaml
 analyzer:
   exclude:
     - build/**
diff --git a/examples/echo/pubspec.yaml b/examples/echo/pubspec.yaml
@@ -13,4 +13,4 @@ dev_dependencies:
   http: ^0.13.5
   mocktail: ^0.3.0
   test: ^1.19.2
-  very_good_analysis: ^3.0.1
+  very_good_analysis: ^3.1.0
diff --git a/examples/hello_world/analysis_options.yaml b/examples/hello_world/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: package:very_good_analysis/analysis_options.3.0.1.yaml
+include: package:very_good_analysis/analysis_options.3.1.0.yaml
 analyzer:
   exclude:
     - build/**
diff --git a/examples/hello_world/pubspec.yaml b/examples/hello_world/pubspec.yaml
@@ -13,4 +13,4 @@ dev_dependencies:
   http: ^0.13.5
   mocktail: ^0.3.0
   test: ^1.19.2
-  very_good_analysis: ^3.0.1
+  very_good_analysis: ^3.1.0
diff --git a/examples/todos/analysis_options.yaml b/examples/todos/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: package:very_good_analysis/analysis_options.3.0.1.yaml
+include: package:very_good_analysis/analysis_options.3.1.0.yaml
 analyzer:
   exclude:
     - build/**
diff --git a/examples/todos/packages/in_memory_todos_data_source/analysis_options.yaml b/examples/todos/packages/in_memory_todos_data_source/analysis_options.yaml
@@ -1 +1 @@
-include: package:very_good_analysis/analysis_options.3.0.1.yaml
+include: package:very_good_analysis/analysis_options.3.1.0.yaml
diff --git a/examples/todos/packages/in_memory_todos_data_source/pubspec.yaml b/examples/todos/packages/in_memory_todos_data_source/pubspec.yaml
@@ -14,4 +14,4 @@ dependencies:
 dev_dependencies:
   mocktail: ^0.3.0
   test: ^1.19.2
-  very_good_analysis: ^3.0.1
+  very_good_analysis: ^3.1.0
diff --git a/examples/todos/packages/todos_data_source/analysis_options.yaml b/examples/todos/packages/todos_data_source/analysis_options.yaml
@@ -1 +1 @@
-include: package:very_good_analysis/analysis_options.3.0.1.yaml
+include: package:very_good_analysis/analysis_options.3.1.0.yaml
diff --git a/examples/todos/packages/todos_data_source/pubspec.yaml b/examples/todos/packages/todos_data_source/pubspec.yaml
@@ -16,4 +16,4 @@ dev_dependencies:
   json_serializable: ^6.3.1
   mocktail: ^0.3.0
   test: ^1.19.2
-  very_good_analysis: ^3.0.1
+  very_good_analysis: ^3.1.0
diff --git a/examples/todos/pubspec.yaml b/examples/todos/pubspec.yaml
@@ -17,4 +17,4 @@ dev_dependencies:
   http: ^0.13.5
   mocktail: ^0.3.0
   test: ^1.19.2
-  very_good_analysis: ^3.0.1
+  very_good_analysis: ^3.1.0
diff --git a/packages/dart_frog/analysis_options.yaml b/packages/dart_frog/analysis_options.yaml
@@ -1 +1 @@
-include: package:very_good_analysis/analysis_options.3.0.1.yaml
+include: package:very_good_analysis/analysis_options.3.1.0.yaml
diff --git a/packages/dart_frog/lib/src/router.dart b/packages/dart_frog/lib/src/router.dart
@@ -60,14 +60,14 @@ class Router {
       throw ArgumentError.value(verb, 'verb', 'expected a valid HTTP method');
     }
 
-    final _verb = verb.toUpperCase();
+    final upperCaseVerb = verb.toUpperCase();
 
-    if (_verb == 'GET') {
+    if (upperCaseVerb == 'GET') {
       // Handling in a 'GET' request without handling a 'HEAD' request is always
       // wrong, thus, we add a default implementation that discards the body.
       _routes.add(RouterEntry('HEAD', route, handler, middleware: _removeBody));
     }
-    _routes.add(RouterEntry(_verb, route, handler));
+    _routes.add(RouterEntry(upperCaseVerb, route, handler));
   }
 
   /// Handle all request to [route] using [handler].
@@ -304,8 +304,12 @@ class RouterEntry {
   /// Pattern for parsing the route pattern
   static final RegExp _parser = RegExp(r'([^<]*)(?:<([^>|]+)(?:\|([^>]*))?>)?');
 
-  /// The route entry verb and route.
-  final String verb, route;
+  /// The route entry verb.
+  final String verb;
+
+  /// The route entry route.
+  final String route;
+
   final Function _handler;
   final Middleware _middleware;
 
@@ -345,27 +349,27 @@ class RouterEntry {
     final request = context.request._request.change(
       context: {'shelf_router/params': params},
     );
-    final _context = RequestContext._(request);
+    final updatedContext = RequestContext._(request);
 
     return await _middleware((request) async {
       if (_mounted) {
         // if this route is mounted, we include
         // the route entry params so that the mount can extract the parameters/
         // ignore: avoid_dynamic_calls
-        return await _handler(_context, this.params) as Response;
+        return await _handler(updatedContext, this.params) as Response;
       }
 
       if (_handler is Handler || _params.isEmpty) {
         // ignore: avoid_dynamic_calls
-        return await _handler(_context) as Response;
+        return await _handler(updatedContext) as Response;
       }
 
       final dynamic result = await Function.apply(_handler, <dynamic>[
-        _context,
+        updatedContext,
         ..._params.map((n) => params[n]),
       ]);
       return result as Response;
-    })(_context);
+    })(updatedContext);
   }
 }
 
diff --git a/packages/dart_frog/pubspec.yaml b/packages/dart_frog/pubspec.yaml
@@ -7,7 +7,7 @@ issue_tracker: https://github.com/VeryGoodOpenSource/dart_frog/issues
 documentation: https://dartfrog.vgv.dev/docs/overview
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
+  sdk: ">=2.18.0 <3.0.0"
 
 dependencies:
   http_methods: ^1.1.0
@@ -20,4 +20,4 @@ dev_dependencies:
   mocktail: ^0.3.0
   path: ^1.8.2
   test: ^1.19.2
-  very_good_analysis: ^3.0.1
+  very_good_analysis: ^3.1.0
diff --git a/packages/dart_frog/test/src/request_logger_test.dart b/packages/dart_frog/test/src/request_logger_test.dart
@@ -19,13 +19,13 @@ void main() {
     }
 
     test('proxies to logRequests', () async {
-      final _handler = const Pipeline()
+      final handler = const Pipeline()
           .addMiddleware(requestLogger(logger: logger))
           .addHandler((_) => Response());
       final request = Request.get(Uri.parse('http://localhost/'));
       final context = _MockRequestContext();
       when(() => context.request).thenReturn(request);
-      await _handler(context);
+      await handler(context);
 
       expect(gotLog, isTrue);
     });
diff --git a/packages/dart_frog_cli/analysis_options.yaml b/packages/dart_frog_cli/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: package:very_good_analysis/analysis_options.3.0.1.yaml
+include: package:very_good_analysis/analysis_options.3.1.0.yaml
 analyzer:
   exclude:
     - lib/src/version.dart
diff --git a/packages/dart_frog_cli/pubspec.yaml b/packages/dart_frog_cli/pubspec.yaml
@@ -7,7 +7,7 @@ issue_tracker: https://github.com/VeryGoodOpenSource/dart_frog/issues
 documentation: https://dartfrog.vgv.dev/docs/overview
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
+  sdk: ">=2.18.0 <3.0.0"
 
 dependencies:
   args: ^2.1.0
@@ -25,7 +25,7 @@ dev_dependencies:
   build_version: ^2.0.0
   mocktail: ^0.3.0
   test: ^1.19.2
-  very_good_analysis: ^3.0.1
+  very_good_analysis: ^3.1.0
 
 executables:
   dart_frog:
diff --git a/packages/dart_frog_gen/analysis_options.yaml b/packages/dart_frog_gen/analysis_options.yaml
@@ -1 +1 @@
-include: package:very_good_analysis/analysis_options.3.0.1.yaml
+include: package:very_good_analysis/analysis_options.3.1.0.yaml
diff --git a/packages/dart_frog_gen/lib/src/build_route_configuration.dart b/packages/dart_frog_gen/lib/src/build_route_configuration.dart
@@ -75,10 +75,10 @@ List<RouteDirectory> _getRouteDirectories({
   // Only add nested middleware -- global middleware is added separately.
   MiddlewareFile? middleware;
   if (directory.path != path.join(Directory.current.path, 'routes')) {
-    final _middleware = File(path.join(directory.path, '_middleware.dart'));
-    if (_middleware.existsSync()) {
+    final middlewareFile = File(path.join(directory.path, '_middleware.dart'));
+    if (middlewareFile.existsSync()) {
       final middlewarePath = path
-          .relative(_middleware.path, from: routesDirectory.path)
+          .relative(middlewareFile.path, from: routesDirectory.path)
           .replaceAll(r'\', '/');
       middleware = MiddlewareFile(
         name: middlewarePath.toAlias(),
diff --git a/packages/dart_frog_gen/pubspec.yaml b/packages/dart_frog_gen/pubspec.yaml
@@ -7,12 +7,12 @@ issue_tracker: https://github.com/VeryGoodOpenSource/dart_frog/issues
 documentation: https://dartfrog.vgv.dev/docs/overview
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
+  sdk: ">=2.18.0 <3.0.0"
 
 dependencies:
   path: ^1.8.1
 
 dev_dependencies:
   mocktail: ^0.3.0
   test: ^1.19.2
-  very_good_analysis: ^3.0.1
+  very_good_analysis: ^3.1.0

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-include: package:very_good_analysis/analysis_options.3.0.1.yaml`
	`1`	`+include: package:very_good_analysis/analysis_options.3.1.0.yaml`