Update builder

Workiva · Oct 9, 2020 · 8855f7e · 8855f7e
1 parent fbac108
commit 8855f7e
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 10 deletions.
diff --git a/lib/src/builder/codegen/component_generator.dart b/lib/src/builder/codegen/component_generator.dart
@@ -172,16 +172,7 @@ class _ComponentGenerator extends ComponentGenerator {
 
   @override
   void _generateAdditionalComponentBody() {
-    outputContentsBuffer
-      ..writeln()
-      ..writeln('  @override')
-      ..writeln('  PropsMetaCollection get propsMeta => const PropsMetaCollection({');
-    for (final name in declaration.allPropsMixins) {
-      final names = TypedMapNames(name.name);
-      outputContentsBuffer.write('    ${generatedMixinWarningCommentLine(names, isProps: true)}');
-      outputContentsBuffer.writeln('    ${names.consumerName}: ${names.publicGeneratedMetaName},');
-    }
-    outputContentsBuffer.writeln('  });');
+    generatePropsMeta(outputContentsBuffer, declaration.allPropsMixins);
   }
 }
 

diff --git a/lib/src/builder/codegen/typed_map_impl_generator.dart b/lib/src/builder/codegen/typed_map_impl_generator.dart
@@ -134,6 +134,7 @@ abstract class TypedMapImplGenerator extends BoilerplateDeclarationGenerator {
   String _generateConcretePropsOrStateImpl({
     String componentFactoryName,
     String propKeyNamespace,
+    List<Identifier> allPropsMixins,
   }) {
     if (isProps) {
       if (componentFactoryName == null || propKeyNamespace == null) {
@@ -222,6 +223,10 @@ abstract class TypedMapImplGenerator extends BoilerplateDeclarationGenerator {
             '  /// The default namespace for the prop getters/setters generated for this class.')
         ..writeln('  @override')
         ..writeln('  String get propKeyNamespace => ${stringLiteral(propKeyNamespace)};');
+
+      if (allPropsMixins != null) {
+        generatePropsMeta(buffer, allPropsMixins, classType: 'PropsInstanceMeta', fieldName: r'$meta', isConst: false);
+      }
     }
 
     // End of class body
@@ -345,10 +350,13 @@ class _TypedMapImplGenerator extends TypedMapImplGenerator {
   @override
   final Version version;
 
+  final List<Identifier> allPropsMixins;
+
   _TypedMapImplGenerator.props(ClassComponentDeclaration declaration)
       : names = TypedMapNames(declaration.props.either.name.name),
         factoryNames = [FactoryNames(declaration.factory.name.name)],
         member = declaration.props.either,
+        allPropsMixins = declaration.allPropsMixins,
         isProps = true,
         componentFactoryName = ComponentNames(declaration.component.name.name).componentFactoryName,
         isFunctionComponentDeclaration = false,
@@ -358,6 +366,7 @@ class _TypedMapImplGenerator extends TypedMapImplGenerator {
       : names = TypedMapNames(declaration.state.either.name.name),
         factoryNames = [FactoryNames(declaration.factory.name.name)],
         member = declaration.state.either,
+        allPropsMixins = null,
         isProps = false,
         componentFactoryName = ComponentNames(declaration.component.name.name).componentFactoryName,
         isFunctionComponentDeclaration = false,
@@ -369,6 +378,7 @@ class _TypedMapImplGenerator extends TypedMapImplGenerator {
         factoryNames =
             declaration.factories.map((factory) => FactoryNames(factory.name.name)).toList(),
         member = declaration.props.either,
+        allPropsMixins = declaration.props.either.nodeHelper.mixins?.map<Identifier>((mixin) => mixin.name)?.toList(),
         isProps = true,
         componentFactoryName = 'null',
         isFunctionComponentDeclaration = declaration.factories.first.shouldGenerateConfig,
@@ -403,6 +413,7 @@ class _TypedMapImplGenerator extends TypedMapImplGenerator {
       componentFactoryName: componentFactoryName,
       // This doesn't really apply to the new boilerplate
       propKeyNamespace: '',
+      allPropsMixins: allPropsMixins,
     ));
   }
 

diff --git a/lib/src/builder/codegen/util.dart b/lib/src/builder/codegen/util.dart
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import 'package:analyzer/dart/ast/ast.dart';
 import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
 import 'package:over_react/src/component_declaration/annotations.dart' as annotations;
@@ -66,3 +67,20 @@ String generatedMixinWarningCommentLine(TypedMapNames mixinNames, {@required boo
 
   return value;
 }
+
+void generatePropsMeta(StringBuffer buffer, List<Identifier> mixins, {
+  String classType = 'PropsMetaCollection',
+  String fieldName = 'propsMeta',
+  bool isConst = true,
+}) {
+  buffer
+    ..writeln()
+    ..writeln('  @override')
+    ..writeln('  $classType get $fieldName => ${isConst ? 'const' : ''} $classType({');
+  for (final name in mixins) {
+    final names = TypedMapNames(name.name);
+    buffer.write('    ${generatedMixinWarningCommentLine(names, isProps: true)}');
+    buffer.writeln('    ${names.consumerName}: ${names.publicGeneratedMetaName},');
+  }
+  buffer.writeln('  });');
+}