[pigeon] Creates new Generator classes for each language

packages/pigeon/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.2.16
+
+* Creates new Generator classes for each language.
+
 ## 4.2.15
 
 * Relocates generator classes. (Reverted)

packages/pigeon/lib/cpp_generator.dart

@@ -4,6 +4,7 @@
 
 import 'ast.dart';
 import 'functional.dart';
+import 'generator.dart';
 import 'generator_tools.dart';
 import 'pigeon_lib.dart' show Error;
 
@@ -64,6 +65,42 @@ class CppOptions {
   }
 }
 
+/// Class that manages all Cpp header code generation.
+class CppHeaderGenerator extends Generator<CppOptions> {
+  /// Instantiates a Cpp Generator.
+  CppHeaderGenerator({
+    required CppOptions languageOptions,
+    required Root root,
+    required StringSink sink,
+    required this.path,
+  }) : super(languageOptions: languageOptions, root: root, sink: sink);
+
+  /// Path to output generated Cpp Header file.
+  String path;
+
+  /// Generates Cpp header files with specified [CppOptions]
+  @override
+  void generate() {
+    generateCppHeader(path, languageOptions, root, sink);
+  }
+}
+
+/// Class that manages all Cpp code generation.
+class CppSourceGenerator extends Generator<CppOptions> {
+  /// Instantiates a Cpp Generator.
+  CppSourceGenerator({
+    required CppOptions languageOptions,
+    required Root root,
+    required StringSink sink,
+  }) : super(languageOptions: languageOptions, root: root, sink: sink);
+
+  /// Generates Cpp files with specified [CppOptions]
+  @override
+  void generate() {
+    generateCppSource(languageOptions, root, sink);
+  }
+}
+
 String _getCodecSerializerName(Api api) => '${api.name}CodecSerializer';
 
 const String _pointerPrefix = 'pointer';

packages/pigeon/lib/dart_generator.dart

@@ -9,6 +9,7 @@ import 'package:yaml/yaml.dart' as yaml;
 
 import 'ast.dart';
 import 'functional.dart';
+import 'generator.dart';
 import 'generator_tools.dart';
 
 /// Documentation comment open symbol.
@@ -55,6 +56,52 @@ class DartOptions {
   }
 }
 
+/// Class that manages all Dart code generation.
+class DartGenerator extends Generator<DartOptions> {
+  /// Instantiates a Dart Generator.
+  DartGenerator({
+    required DartOptions languageOptions,
+    required Root root,
+    required StringSink sink,
+  }) : super(languageOptions: languageOptions, root: root, sink: sink);
+
+  /// Generates Dart files with specified [DartOptions]
+  @override
+  void generate() {
+    generateDart(languageOptions, root, sink);
+  }
+}
+
+/// Class that manages all Dart code generation.
+class DartTestGenerator extends Generator<DartOptions> {
+  /// Instantiates a Dart Generator.
+  DartTestGenerator({
+    required DartOptions languageOptions,
+    required Root root,
+    required StringSink sink,
+    required this.dartOutPath,
+    required this.testOutPath,
+  }) : super(languageOptions: languageOptions, root: root, sink: sink);
+
+  /// Path to output generated Dart file.
+  String dartOutPath;
+
+  /// Path to output generated Test file.
+  String testOutPath;
+
+  /// Generates Dart files with specified [DartOptions]
+  @override
+  void generate() {
+    generateTestDart(
+      languageOptions,
+      root,
+      sink,
+      dartOutPath: dartOutPath,
+      testOutPath: testOutPath,
+    );
+  }
+}
+
 String _escapeForDartSingleQuotedString(String raw) {
   return raw
       .replaceAll(r'\', r'\\')

packages/pigeon/lib/generator.dart

@@ -0,0 +1,29 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'ast.dart';
+
+/// A Super class of generator classes.
+///
+/// This is meant to provide structure and direction for future generator work.
+abstract class Generator<T> {
+  /// Instantiates a Generator.
+  const Generator({
+    required this.languageOptions,
+    required this.root,
+    required this.sink,
+  });
+
+  ///
+  final T languageOptions;
+
+  ///
+  final Root root;
+
+  ///
+  final StringSink sink;
+
+  /// Generates files for specified language with specified [languageOptions]
+  void generate();
+}

packages/pigeon/lib/generator_tools.dart

@@ -9,7 +9,7 @@ import 'dart:mirrors';
 import 'ast.dart';
 
 /// The current version of pigeon. This must match the version in pubspec.yaml.
-const String pigeonVersion = '4.2.15';
+const String pigeonVersion = '4.2.16';
 
 /// Read all the content from [stdin] to a String.
 String readStdin() {

packages/pigeon/lib/java_generator.dart

@@ -4,6 +4,7 @@
 
 import 'ast.dart';
 import 'functional.dart';
+import 'generator.dart';
 import 'generator_tools.dart';
 import 'pigeon_lib.dart' show TaskQueueType;
 
@@ -84,6 +85,22 @@ class JavaOptions {
   }
 }
 
+/// Class that manages all Java code generation.
+class JavaGenerator extends Generator<JavaOptions> {
+  /// Instantiates a Java Generator.
+  JavaGenerator({
+    required JavaOptions languageOptions,
+    required Root root,
+    required StringSink sink,
+  }) : super(languageOptions: languageOptions, root: root, sink: sink);
+
+  /// Generates Java files with specified [JavaOptions]
+  @override
+  void generate() {
+    generateJava(languageOptions, root, sink);
+  }
+}
+
 /// Calculates the name of the codec that will be generated for [api].
 String _getCodecName(Api api) => '${api.name}Codec';
 

packages/pigeon/lib/kotlin_generator.dart

@@ -4,6 +4,7 @@
 
 import 'ast.dart';
 import 'functional.dart';
+import 'generator.dart';
 import 'generator_tools.dart';
 import 'pigeon_lib.dart' show TaskQueueType;
 
@@ -64,6 +65,22 @@ class KotlinOptions {
   }
 }
 
+/// Class that manages all Kotlin code generation.
+class KotlinGenerator extends Generator<KotlinOptions> {
+  /// Instantiates a Kotlin Generator.
+  KotlinGenerator({
+    required KotlinOptions languageOptions,
+    required Root root,
+    required StringSink sink,
+  }) : super(languageOptions: languageOptions, root: root, sink: sink);
+
+  /// Generates Kotlin files with specified [KotlinOptions]
+  @override
+  void generate() {
+    generateKotlin(languageOptions, root, sink);
+  }
+}
+
 /// Calculates the name of the codec that will be generated for [api].
 String _getCodecName(Api api) => '${api.name}Codec';
 

packages/pigeon/lib/objc_generator.dart

@@ -4,6 +4,7 @@
 
 import 'ast.dart';
 import 'functional.dart';
+import 'generator.dart';
 import 'generator_tools.dart';
 import 'pigeon_lib.dart' show Error, TaskQueueType;
 
@@ -63,6 +64,38 @@ class ObjcOptions {
   }
 }
 
+/// Class that manages all Objc header code generation.
+class ObjcHeaderGenerator extends Generator<ObjcOptions> {
+  /// Instantiates a Objc Generator.
+  ObjcHeaderGenerator({
+    required ObjcOptions languageOptions,
+    required Root root,
+    required StringSink sink,
+  }) : super(languageOptions: languageOptions, root: root, sink: sink);
+
+  /// Generates Objc header files with specified [ObjcOptions]
+  @override
+  void generate() {
+    generateObjcHeader(languageOptions, root, sink);
+  }
+}
+
+/// Class that manages all Objc code generation.
+class ObjcSourceGenerator extends Generator<ObjcOptions> {
+  /// Instantiates a Objc Generator.
+  ObjcSourceGenerator({
+    required ObjcOptions languageOptions,
+    required Root root,
+    required StringSink sink,
+  }) : super(languageOptions: languageOptions, root: root, sink: sink);
+
+  /// Generates Objc files with specified [ObjcOptions]
+  @override
+  void generate() {
+    generateObjcSource(languageOptions, root, sink);
+  }
+}
+
 /// Calculates the ObjC class name, possibly prefixed.
 String _className(String? prefix, String className) {
   if (prefix != null) {