refactor: improve analysis options parsing robustness with type standardization and fix path resolution logic

Author: Illia Aihistov

lib/src/common/parameter_parser/analysis_options_loader.dart

@@ -10,8 +10,7 @@ class AnalysisOptionsLoader {
   final ResourceProvider _resourceProvider;
   final Map<String, CachedPackageRules> _rulesCache = {};
 
-  // Caches directory path -> nearest analysis_options.yaml file path
-  final Map<String, String?> _nearestYamlCache = {};
+
 
   late final AnalysisOptionsParser _parser;
 
@@ -101,29 +100,27 @@ class AnalysisOptionsLoader {
   }
 
   String? _findNearestAnalysisOptionsFilePath(String startDirectoryPath) {
-    return _nearestYamlCache.putIfAbsent(startDirectoryPath, () {
-      final pathContext = _resourceProvider.pathContext;
-      var currentDirectoryPath = startDirectoryPath;
-
-      while (currentDirectoryPath.isNotEmpty) {
-        final candidatePath = pathContext.join(
-          currentDirectoryPath,
-          'analysis_options.yaml',
-        );
-        final candidateFile = _resourceProvider.getFile(candidatePath);
+    final pathContext = _resourceProvider.pathContext;
+    var currentDirectoryPath = startDirectoryPath;
+
+    while (currentDirectoryPath.isNotEmpty) {
+      final candidatePath = pathContext.join(
+        currentDirectoryPath,
+        'analysis_options.yaml',
+      );
+      final candidateFile = _resourceProvider.getFile(candidatePath);
 
-        if (candidateFile.exists) {
-          return candidatePath;
-        }
+      if (candidateFile.exists) {
+        return candidatePath;
+      }
 
-        final parentDir = pathContext.dirname(currentDirectoryPath);
-        if (parentDir == currentDirectoryPath) {
-          break;
-        }
-        currentDirectoryPath = parentDir;
+      final parentDir = pathContext.dirname(currentDirectoryPath);
+      if (parentDir == currentDirectoryPath) {
+        break;
       }
+      currentDirectoryPath = parentDir;
+    }
 
-      return null;
-    });
+    return null;
   }
 }

lib/src/common/parameter_parser/analysis_options_parser.dart

@@ -27,7 +27,6 @@ class AnalysisOptionsParser {
     if (seenPaths.contains(path)) {
       return const RulesData.empty();
     }
-    seenPaths.add(path);
 
     final yaml = _parseYaml(analysisOptionsFile);
     if (yaml == null) {
@@ -37,10 +36,11 @@ class AnalysisOptionsParser {
     final mergedRules = <String, Map<String, Object?>>{};
     final disabledRules = <String>{};
 
+    final nextSeenPaths = {...seenPaths, path};
     _resolveAndMergeIncludes(
       analysisOptionsFile,
       yaml,
-      seenPaths,
+      nextSeenPaths,
       mergedRules,
       disabledRules,
     );
@@ -50,19 +50,34 @@ class AnalysisOptionsParser {
     return RulesData(rules: mergedRules, disabledRules: disabledRules);
   }
 
-  Map<dynamic, dynamic>? _parseYaml(File file) {
+  Map<String, Object?>? _parseYaml(File file) {
     try {
       final optionsString = file.readAsStringSync();
       final parsed = loadYaml(optionsString);
-      return parsed is Map ? parsed : null;
+      if (parsed is! Map) return null;
+      return _toStandardMap(parsed);
     } catch (_) {
       return null;
     }
   }
 
+  Map<String, Object?> _toStandardMap(Map<dynamic, dynamic> map) {
+    return {
+      for (final entry in map.entries)
+        if (entry.key is String)
+          entry.key as String: _toStandardType(entry.value),
+    };
+  }
+
+  Object? _toStandardType(Object? value) => switch (value) {
+        Map() => _toStandardMap(value),
+        Iterable() => value.map(_toStandardType).toList(),
+        _ => value,
+      };
+
   void _resolveAndMergeIncludes(
     File baseFile,
-    Map<dynamic, dynamic> yaml,
+    Map<String, Object?> yaml,
     Set<String> seenPaths,
     Map<String, Map<String, Object?>> mergedRules,
     Set<String> disabledRules,
@@ -97,7 +112,7 @@ class AnalysisOptionsParser {
   }
 
   void _parseRuleOptions(
-    Map<dynamic, dynamic> yaml,
+    Map<String, Object?> yaml,
     Map<String, Map<String, Object?>> mergedRules,
     Set<String> disabledRules,
   ) {
@@ -131,7 +146,7 @@ class AnalysisOptionsParser {
     }
   }
 
-  Object? _extractDiagnostics(Map<dynamic, dynamic> yaml) {
+  Object? _extractDiagnostics(Map<String, Object?> yaml) {
     final pluginConfig = yaml[kPluginName];
     if (pluginConfig is Map) {
       return pluginConfig['diagnostics'];
@@ -164,7 +179,7 @@ class AnalysisOptionsParser {
   /// from running, we parse this section and add suppressed rules
   /// to [disabledRules].
   void _parseSuppressedErrors(
-    Map<dynamic, dynamic> yaml,
+    Map<String, Object?> yaml,
     Map<String, Map<String, Object?>> mergedRules,
     Set<String> disabledRules,
   ) {

lib/src/common/parameter_parser/package_config_resolver.dart

@@ -114,11 +114,13 @@ class PackageConfigResolver {
         final rootUri = Uri.parse(rootUriString);
         final resolvedRootUri = rootUri.isAbsolute
             ? rootUri
-            : Uri.file(packageConfigPath).resolveUri(rootUri);
+            : _resourceProvider.pathContext
+                  .toUri(packageConfigPath)
+                  .resolveUri(rootUri);
 
         if (resolvedRootUri.isScheme('file')) {
           result[name] = _resourceProvider.pathContext.join(
-            resolvedRootUri.toFilePath(),
+            _resourceProvider.pathContext.fromUri(resolvedRootUri),
             packageUriString,
           );
         }

lib/src/lints/avoid_using_api/models/avoid_using_api_parameters.dart

@@ -48,9 +48,14 @@ class AvoidUsingApiParameters {
     return AvoidUsingApiParameters(
       entries: List<AvoidUsingApiEntryParameters>.from(
         (json['entries'] as Iterable?)?.map(
-              (e) => AvoidUsingApiEntryParameters.fromJson(
-                (e as YamlMap).toMap(),
-              ),
+              (e) {
+                if (e is YamlMap) {
+                  return AvoidUsingApiEntryParameters.fromJson(e.toMap());
+                }
+                return AvoidUsingApiEntryParameters.fromJson(
+                  Map<String, Object?>.from(e as Map),
+                );
+              },
             ) ??
             [],
       ),