Merge pull request #14 from jwren/update-analysis-options-strict-types

Enable strict analysis options and resolve type warnings

Author: johnpryan

tool/analysis_options.yaml

@@ -13,15 +13,6 @@
 
 include: package:lints/recommended.yaml
 
-# Uncomment the following section to specify additional rules.
-
-# analyzer:
-#   exclude:
-#     - path/to/excluded/files/**
-
-# For more information about the core and recommended set of lints, see
-# https://dart.dev/go/core-lints
-
 linter:
   # The lint rules applied to this project can be customized in the
   # section below to disable rules from the `package:flutter_lints/flutter.yaml`
@@ -35,6 +26,8 @@ linter:
   # producing the lint.
   rules:
     # Error Prevention
+    unnecessary_statements: true
+    no_self_assignments: true
     avoid_catches_without_on_clauses: true
     avoid_catching_errors: true
     avoid_returning_this: true
@@ -113,6 +106,7 @@ linter:
     unnecessary_string_interpolations: true
     unnecessary_this: true
     use_function_type_syntax_for_parameters: true
+    use_if_null_to_convert_nulls_to_bools: true
     use_string_buffers: true
     use_to_and_as_if_applicable: true
 
@@ -128,11 +122,22 @@ linter:
     library_private_types_in_public_api: true
     prefer_asserts_in_initializer_lists: true
     prefer_constructors_over_static_methods: true
+    secure_pubspec_urls: true
+    sort_pub_dependencies: true
+    unnecessary_to_list_in_spreads: true
+    use_super_parameters: true
+    annotate_overrides: true
 
     # Documentation
     dangling_library_doc_comments: true
     library_annotations: true
     public_member_api_docs: true
 
+analyzer:
+  language:
+    strict-casts: true
+    strict-inference: true
+    strict-raw-types: true
+
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options

tool/bin/skills.dart

@@ -15,9 +15,10 @@ const String version = '0.1.0';
 void main(List<String> arguments) async {
   final httpClient = http.Client();
 
-  final runner = CommandRunner('skills', 'A sample command-line application.')
-    ..addCommand(GenerateSkillCommand(httpClient: httpClient))
-    ..addCommand(ValidateSkillCommand(httpClient: httpClient));
+  final runner =
+      CommandRunner<void>('skills', 'A sample command-line application.')
+        ..addCommand(GenerateSkillCommand(httpClient: httpClient))
+        ..addCommand(ValidateSkillCommand(httpClient: httpClient));
 
   runner.argParser.addFlag(
     'version',

tool/lib/src/commands/base_skill_command.dart

@@ -14,7 +14,7 @@ import '../models/skill_params.dart';
 import '../services/gemini_service.dart';
 
 /// Base command for skill operations.
-abstract class BaseSkillCommand extends Command {
+abstract class BaseSkillCommand extends Command<void> {
   /// Creates a new [BaseSkillCommand].
   BaseSkillCommand({
     required this.httpClient,
@@ -64,7 +64,11 @@ abstract class BaseSkillCommand extends Command {
     final yamlContent = file.readAsStringSync();
     final yamlList = loadYaml(yamlContent) as YamlList;
     final skills = yamlList
-        .map((e) => SkillParams.fromJson(jsonDecode(jsonEncode(e))))
+        .map(
+          (e) => SkillParams.fromJson(
+            jsonDecode(jsonEncode(e)) as Map<String, dynamic>,
+          ),
+        )
         .toList();
 
     final skillFilter = argResults?['skill'] as String?;
@@ -95,7 +99,7 @@ abstract class BaseSkillCommand extends Command {
 
     int thinkingBudget;
     try {
-      thinkingBudget = int.parse(argResults!['thinking-budget']);
+      thinkingBudget = int.parse(argResults!['thinking-budget'] as String);
     } on FormatException {
       logger.warning(
         'Invalid thinking-budget: ${argResults!['thinking-budget']}. Skipping.',

tool/test/commands/base_skill_command_test.dart

@@ -36,7 +36,7 @@ class _TestSkillCommand extends BaseSkillCommand {
 
 void main() {
   group('BaseSkillCommand Edge Cases', () {
-    late CommandRunner runner;
+    late CommandRunner<void> runner;
     late Directory tempDir;
     late MockClient mockClient;
     final logs = <String>[];
@@ -46,7 +46,7 @@ void main() {
         'base_skill_commands_test',
       );
       mockClient = MockClient((request) async => throw UnimplementedError());
-      runner = CommandRunner('skills', 'Test runner')
+      runner = CommandRunner<void>('skills', 'Test runner')
         ..addCommand(_TestSkillCommand(httpClient: mockClient));
 
       Logger.root.level = Level.INFO;
@@ -71,8 +71,12 @@ void main() {
     test('logs warning when no skills match the --skill filter', () async {
       final configFile = File(p.join(tempDir.path, 'config.yaml'));
       await configFile.writeAsString(
-        jsonEncode([
-          {'name': 'existent-skill', 'description': 'desc', 'resources': []},
+        jsonEncode(<Map<String, dynamic>>[
+          {
+            'name': 'existent-skill',
+            'description': 'desc',
+            'resources': <String>[],
+          },
         ]),
       );
 
@@ -102,8 +106,12 @@ void main() {
     test('logs severe error when GEMINI_API_KEY is not set', () async {
       final configFile = File(p.join(tempDir.path, 'config.yaml'));
       await configFile.writeAsString(
-        jsonEncode([
-          {'name': 'existent-skill', 'description': 'desc', 'resources': []},
+        jsonEncode(<Map<String, dynamic>>[
+          {
+            'name': 'existent-skill',
+            'description': 'desc',
+            'resources': <String>[],
+          },
         ]),
       );
 

tool/test/generate_skills_retry_test.dart

@@ -15,14 +15,14 @@ import 'package:test/test.dart';
 
 void main() {
   group('GenerateSkillsCommand Retry Logic', () {
-    late CommandRunner runner;
+    late CommandRunner<void> runner;
     late Directory tempDir;
     late File inputFile;
 
     setUp(() async {
       tempDir = await Directory.systemTemp.createTemp('skills_retry_test');
       inputFile = File(p.join(tempDir.path, 'input.yaml'));
-      runner = CommandRunner('skills', 'Test runner');
+      runner = CommandRunner<void>('skills', 'Test runner');
     });
 
     tearDown(() async {

tool/test/generate_skills_test.dart

@@ -15,14 +15,14 @@ import 'package:test/test.dart';
 
 void main() {
   group('GenerateSkillsCommand', () {
-    late CommandRunner runner;
+    late CommandRunner<void> runner;
     late Directory tempDir;
     late File videoFile;
 
     setUp(() async {
       tempDir = await Directory.systemTemp.createTemp('skills_gen_test');
       videoFile = File(p.join(tempDir.path, 'input.yaml'));
-      runner = CommandRunner('skills', 'Test runner');
+      runner = CommandRunner<void>('skills', 'Test runner');
     });
 
     tearDown(() async {

tool/test/validate_skills_test.dart

@@ -15,7 +15,7 @@ import 'package:test/test.dart';
 
 void main() {
   group('ValidateSkillCommand', () {
-    late CommandRunner runner;
+    late CommandRunner<void> runner;
     late Directory tempDir;
     late Directory skillsDir;
     late Directory validationDir;
@@ -64,7 +64,7 @@ void main() {
         ]),
       );
 
-      runner = CommandRunner('skills', 'Test runner')
+      runner = CommandRunner<void>('skills', 'Test runner')
         ..addCommand(
           ValidateSkillCommand(
             environment: {'GEMINI_API_KEY': 'test-key'},
@@ -134,7 +134,7 @@ void main() {
         return http.Response('Not Found', 404);
       });
 
-      runner = CommandRunner('skills', 'Test runner')
+      runner = CommandRunner<void>('skills', 'Test runner')
         ..addCommand(
           ValidateSkillCommand(
             environment: {'GEMINI_API_KEY': 'test-key'},
@@ -179,7 +179,7 @@ void main() {
         ]),
       );
 
-      runner = CommandRunner('skills', 'Test runner')
+      runner = CommandRunner<void>('skills', 'Test runner')
         ..addCommand(
           ValidateSkillCommand(
             environment: {'GEMINI_API_KEY': 'test-key'},
@@ -200,7 +200,7 @@ void main() {
     test('logs severe error when config file not found', () async {
       final path = p.join(tempDir.path, 'NON_EXISTENT.yaml');
 
-      runner = CommandRunner('skills', 'Test runner')
+      runner = CommandRunner<void>('skills', 'Test runner')
         ..addCommand(
           ValidateSkillCommand(
             environment: {'GEMINI_API_KEY': 'test-key'},
@@ -245,7 +245,7 @@ void main() {
         return http.Response('Not Found', 404);
       });
 
-      runner = CommandRunner('skills', 'Test runner')
+      runner = CommandRunner<void>('skills', 'Test runner')
         ..addCommand(
           ValidateSkillCommand(
             environment: {'GEMINI_API_KEY': 'test-key'},
@@ -283,7 +283,7 @@ void main() {
         throw Exception('Network Error');
       });
 
-      runner = CommandRunner('skills', 'Test runner')
+      runner = CommandRunner<void>('skills', 'Test runner')
         ..addCommand(
           ValidateSkillCommand(
             environment: {'GEMINI_API_KEY': 'test-key'},
@@ -332,7 +332,7 @@ void main() {
           return http.Response('Not Found', 404);
         });
 
-        runner = CommandRunner('skills', 'Test runner')
+        runner = CommandRunner<void>('skills', 'Test runner')
           ..addCommand(
             ValidateSkillCommand(
               environment: {'GEMINI_API_KEY': 'test-key'},
@@ -382,7 +382,7 @@ void main() {
         return http.Response('Not Found', 404);
       });
 
-      runner = CommandRunner('skills', 'Test runner')
+      runner = CommandRunner<void>('skills', 'Test runner')
         ..addCommand(
           ValidateSkillCommand(
             environment: {'GEMINI_API_KEY': 'test-key'},
@@ -430,7 +430,7 @@ void main() {
         return http.Response('Not Found', 404);
       });
 
-      runner = CommandRunner('skills', 'Test runner')
+      runner = CommandRunner<void>('skills', 'Test runner')
         ..addCommand(
           ValidateSkillCommand(
             environment: {'GEMINI_API_KEY': 'test-key'},
@@ -510,7 +510,7 @@ Content
         return http.Response('Not Found', 404);
       });
 
-      runner = CommandRunner('skills', 'Test runner')
+      runner = CommandRunner<void>('skills', 'Test runner')
         ..addCommand(
           ValidateSkillCommand(
             environment: {'GEMINI_API_KEY': 'test-key'},
@@ -551,7 +551,7 @@ Content
           (request) async => http.Response('', 200),
         );
 
-        runner = CommandRunner('skills', 'Test runner')
+        runner = CommandRunner<void>('skills', 'Test runner')
           ..addCommand(
             ValidateSkillCommand(
               environment: {'GEMINI_API_KEY': 'test-key'},
@@ -591,7 +591,7 @@ Content
         (request) async => throw Exception('Generic Error'),
       );
 
-      runner = CommandRunner('skills', 'Test runner')
+      runner = CommandRunner<void>('skills', 'Test runner')
         ..addCommand(
           ValidateSkillCommand(
             environment: {'GEMINI_API_KEY': 'test-key'},
@@ -651,7 +651,7 @@ Content
         return http.Response('Not Found', 404);
       });
 
-      runner = CommandRunner('skills', 'Test runner')
+      runner = CommandRunner<void>('skills', 'Test runner')
         ..addCommand(
           ValidateSkillCommand(
             environment: {'GEMINI_API_KEY': 'test-key'},