fix: 無効なアノテーションで CLI を失敗させる (#138)

analyzeSourceFiles は解析全体を広い catch で包んでいたため、各 analyzer が
投げる InvalidGenerationSourceError も Warning として握りつぶされ、
generate_swift / generate_widget_swift / generate_kotlin が不完全な出力のまま
exit 0 していた。

- 解決 (getResolvedLibrary) の失敗だけを従来どおり Warning でスキップする
- InvalidGenerationSourceError は全ファイル走査後に InvalidAnnotationsException
  としてまとめて投げる
- CLI は analyzeSourceFilesOrExit 経由で、ファイルパス付きのエラーを出して exit 1

Co-authored-by: Claude Opus 5 <noreply@anthropic.com>

Author: touyou

packages/app_intents_codegen/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [Unreleased]
+
+> **Behavior change for CLI users.** `generate_swift`, `generate_widget_swift`
+> and `generate_kotlin` now **fail with exit code 1** when an annotation is
+> invalid. Previously the analyzer's error was printed as a `Warning: Could not
+> analyze …` line, the spec was left out of the output, and the command still
+> exited 0 — so a project whose only specs were invalid got empty output with
+> no failure. If a build that used to pass now stops here, the printed error
+> names the file and the problem; that spec was never being generated.
+
+- `analyzeSourceFiles` throws `InvalidAnnotationsException` instead of swallowing the analyzers' `InvalidGenerationSourceError`. All files are scanned before it throws, so every invalid spec is reported in one run. A file that fails to **resolve** is still skipped with a warning, as before.
+
 ## 0.16.0
 
 > **Heads-up for `@EntitySpec(valueQuery: true)` users.** The `IntentValueQuery`

packages/app_intents_codegen/bin/generate_kotlin.dart

@@ -100,7 +100,7 @@ Future<void> generateKotlin({
   required String outputFile,
   required String packageName,
 }) async {
-  final analyzeResult = await analyzeSourceFiles(inputDir);
+  final analyzeResult = await analyzeSourceFilesOrExit(inputDir);
 
   if (analyzeResult.isEmpty) {
     stdout.writeln(

packages/app_intents_codegen/bin/generate_swift.dart

@@ -208,7 +208,7 @@ Future<void> generateSwift({
   String? appIntentsPackage,
   List<String> includedPackages = const [],
 }) async {
-  final analyzeResult = await analyzeSourceFiles(inputDir);
+  final analyzeResult = await analyzeSourceFilesOrExit(inputDir);
 
   // Gate on the annotations this generator actually consumes. A project that
   // declares only @WidgetConfigurationSpec has nothing to emit here — its

packages/app_intents_codegen/bin/generate_widget_swift.dart

@@ -180,7 +180,7 @@ Future<void> generateWidgetSwift({
   List<String> includedPackages = const [],
   bool publicAccess = false,
 }) async {
-  final analyzeResult = await analyzeSourceFiles(inputDir);
+  final analyzeResult = await analyzeSourceFilesOrExit(inputDir);
 
   if (analyzeResult.widgetConfigurations.isEmpty) {
     stdout.writeln('No @WidgetConfigurationSpec annotations found.');

packages/app_intents_codegen/lib/src/cli/analyze_sources.dart

@@ -8,6 +8,7 @@ import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:glob/glob.dart';
 import 'package:glob/list_local_fs.dart';
 import 'package:path/path.dart' as path;
+import 'package:source_gen/source_gen.dart' show InvalidGenerationSourceError;
 
 import '../analyzer/entity_analyzer.dart';
 import '../analyzer/enum_analyzer.dart';
@@ -75,11 +76,44 @@ class AnalyzeResult {
       unions.isNotEmpty;
 }
 
+/// An annotation an analyzer rejected, with the file it was found in.
+class InvalidAnnotation {
+  /// Absolute path of the Dart file declaring the annotation.
+  final String filePath;
+
+  /// The analyzer's error.
+  final InvalidGenerationSourceError error;
+
+  const InvalidAnnotation({required this.filePath, required this.error});
+
+  @override
+  String toString() => '$filePath: $error';
+}
+
+/// Thrown by [analyzeSourceFiles] when one or more annotations are invalid.
+///
+/// Every file is still scanned first, so all invalid specs are reported in one
+/// run rather than one per invocation.
+class InvalidAnnotationsException implements Exception {
+  /// The rejected annotations, in scan order.
+  final List<InvalidAnnotation> annotations;
+
+  const InvalidAnnotationsException(this.annotations);
+
+  @override
+  String toString() =>
+      'Found ${annotations.length} invalid annotation(s):\n'
+      '${annotations.map((a) => '  $a').join('\n')}';
+}
+
 /// Scans and analyzes Dart source files for @IntentSpec, @EntitySpec,
 /// @EnumSpec, and @AppShortcutsProvider annotations.
 ///
 /// [inputDir] is the directory to scan (absolute or relative to cwd).
 /// Returns an [AnalyzeResult] with all found annotations.
+///
+/// Throws [InvalidAnnotationsException] if any analyzer rejects an annotation.
+/// A file that fails to resolve is skipped with a warning instead.
 Future<AnalyzeResult> analyzeSourceFiles(String inputDir) async {
   final currentDir = Directory.current.path;
   final absoluteInputDir = path.isAbsolute(inputDir)
@@ -143,80 +177,96 @@ Future<AnalyzeResult> analyzeSourceFiles(String inputDir) async {
   final unionAnalyzer = const UnionAnalyzer();
   final allShortcuts = <AppShortcutInfo>[];
 
+  final invalidAnnotations = <InvalidAnnotation>[];
+
   for (final filePath in dartFiles) {
+    // Only resolution is recoverable: a file the analyzer cannot resolve is
+    // skipped with a warning, as before.
+    final ResolvedLibraryResult resolved;
     try {
       final context = collection.contextFor(filePath);
       final result = await context.currentSession.getResolvedLibrary(filePath);
+      if (result is! ResolvedLibraryResult) continue;
+      resolved = result;
+    } catch (e) {
+      stderr.writeln('  Warning: Could not analyze $filePath: $e');
+      continue;
+    }
 
-      if (result is ResolvedLibraryResult) {
-        final library = result.element;
-
-        for (final element in library.classes) {
-          // Check for @IntentSpec
-          if (intentAnalyzer.hasIntentSpecAnnotation(element)) {
-            final info = intentAnalyzer.analyze(element);
-            if (info != null && !intentsMap.containsKey(info.identifier)) {
-              intentsMap[info.identifier] = info;
-              stdout.writeln('  Found intent: ${info.className}');
-            }
+    // An analyzer rejecting an annotation is not. Swallowing it here used to
+    // drop the spec from the output while the CLI still exited 0.
+    try {
+      final library = resolved.element;
+
+      for (final element in library.classes) {
+        // Check for @IntentSpec
+        if (intentAnalyzer.hasIntentSpecAnnotation(element)) {
+          final info = intentAnalyzer.analyze(element);
+          if (info != null && !intentsMap.containsKey(info.identifier)) {
+            intentsMap[info.identifier] = info;
+            stdout.writeln('  Found intent: ${info.className}');
           }
+        }
 
-          // Check for @EntitySpec
-          if (entityAnalyzer.hasEntitySpecAnnotation(element)) {
-            final info = entityAnalyzer.analyze(element);
-            if (info != null && !entitiesMap.containsKey(info.identifier)) {
-              entitiesMap[info.identifier] = info;
-              stdout.writeln('  Found entity: ${info.className}');
-            }
+        // Check for @EntitySpec
+        if (entityAnalyzer.hasEntitySpecAnnotation(element)) {
+          final info = entityAnalyzer.analyze(element);
+          if (info != null && !entitiesMap.containsKey(info.identifier)) {
+            entitiesMap[info.identifier] = info;
+            stdout.writeln('  Found entity: ${info.className}');
           }
+        }
 
-          // Check for @WidgetConfigurationSpec
-          if (widgetConfigurationAnalyzer.hasWidgetConfigurationSpecAnnotation(
-            element,
-          )) {
-            final info = widgetConfigurationAnalyzer.analyze(element);
-            if (info != null &&
-                !widgetConfigurationsMap.containsKey(info.identifier)) {
-              widgetConfigurationsMap[info.identifier] = info;
-              stdout.writeln('  Found widget configuration: ${info.className}');
-            }
+        // Check for @WidgetConfigurationSpec
+        if (widgetConfigurationAnalyzer.hasWidgetConfigurationSpecAnnotation(
+          element,
+        )) {
+          final info = widgetConfigurationAnalyzer.analyze(element);
+          if (info != null &&
+              !widgetConfigurationsMap.containsKey(info.identifier)) {
+            widgetConfigurationsMap[info.identifier] = info;
+            stdout.writeln('  Found widget configuration: ${info.className}');
           }
+        }
 
-          // Check for @UnionValueSpec
-          if (unionAnalyzer.hasUnionValueSpecAnnotation(element)) {
-            final info = unionAnalyzer.analyze(element);
-            if (info != null && !unionsMap.containsKey(info.identifier)) {
-              unionsMap[info.identifier] = info;
-              stdout.writeln('  Found union: ${info.className}');
-            }
+        // Check for @UnionValueSpec
+        if (unionAnalyzer.hasUnionValueSpecAnnotation(element)) {
+          final info = unionAnalyzer.analyze(element);
+          if (info != null && !unionsMap.containsKey(info.identifier)) {
+            unionsMap[info.identifier] = info;
+            stdout.writeln('  Found union: ${info.className}');
           }
+        }
 
-          // Check for @AppShortcutsProvider
-          if (shortcutAnalyzer.hasAppShortcutsProviderAnnotation(element)) {
-            final shortcuts = shortcutAnalyzer.analyze(element);
-            for (final shortcut in shortcuts) {
-              allShortcuts.add(shortcut);
-              stdout.writeln('  Found shortcut: ${shortcut.shortTitle}');
-            }
+        // Check for @AppShortcutsProvider
+        if (shortcutAnalyzer.hasAppShortcutsProviderAnnotation(element)) {
+          final shortcuts = shortcutAnalyzer.analyze(element);
+          for (final shortcut in shortcuts) {
+            allShortcuts.add(shortcut);
+            stdout.writeln('  Found shortcut: ${shortcut.shortTitle}');
           }
         }
+      }
 
-        // Check for @EnumSpec on enums
-        for (final element in library.enums) {
-          if (enumAnalyzer.hasEnumSpecAnnotation(element)) {
-            final info = enumAnalyzer.analyze(element);
-            if (info != null && !enumsMap.containsKey(info.identifier)) {
-              enumsMap[info.identifier] = info;
-              stdout.writeln('  Found enum: ${info.className}');
-            }
+      // Check for @EnumSpec on enums
+      for (final element in library.enums) {
+        if (enumAnalyzer.hasEnumSpecAnnotation(element)) {
+          final info = enumAnalyzer.analyze(element);
+          if (info != null && !enumsMap.containsKey(info.identifier)) {
+            enumsMap[info.identifier] = info;
+            stdout.writeln('  Found enum: ${info.className}');
           }
         }
       }
-    } catch (e) {
-      stderr.writeln('  Warning: Could not analyze $filePath: $e');
+    } on InvalidGenerationSourceError catch (e) {
+      invalidAnnotations.add(InvalidAnnotation(filePath: filePath, error: e));
     }
   }
 
+  if (invalidAnnotations.isNotEmpty) {
+    throw InvalidAnnotationsException(invalidAnnotations);
+  }
+
   final intents = intentsMap.values.toList();
   final entities = entitiesMap.values.toList();
   final enums = enumsMap.values.toList();
@@ -255,3 +305,14 @@ Future<AnalyzeResult> analyzeSourceFiles(String inputDir) async {
     unions: unions,
   );
 }
+
+/// [analyzeSourceFiles] for the CLIs: an invalid annotation is printed to
+/// stderr and the process exits 1, instead of generating incomplete output.
+Future<AnalyzeResult> analyzeSourceFilesOrExit(String inputDir) async {
+  try {
+    return await analyzeSourceFiles(inputDir);
+  } on InvalidAnnotationsException catch (e) {
+    stderr.writeln('Error: $e');
+    exit(1);
+  }
+}