feat: Improve support for nested fragments

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 7.0.0-beta.12
+
+- support inline fragments in fragment definitions
+
 ## 7.0.0-beta.11
 
 - document generation fix for https://github.com/comigor/artemis/issues/307

lib/generator.dart

@@ -329,7 +329,7 @@ Make sure your query is correct and your schema is updated.''');
         nextFieldName: nextFieldName,
         nextClassName: ClassName(name: nextType.name.value),
         alias: fieldAlias,
-        ofUnion: Nullable<TypeDefinitionNode?>(null),
+        ofUnion: Nullable<Name?>(null),
       ),
     );
   }

lib/generator/data/class_definition.dart

@@ -11,7 +11,7 @@ class ClassDefinition extends Definition with DataPrinter {
   final Iterable<ClassProperty> properties;
 
   /// The type this class extends from, or [null].
-  final Name? extension;
+  final ClassName? extension;
 
   /// The types this class implements.
   final Iterable<String> implementations;

lib/generator/data/fragment_class_definition.dart

@@ -15,8 +15,8 @@ class FragmentClassDefinition extends Definition with DataPrinter {
   /// Instantiate a fragment class definition.
   FragmentClassDefinition({
     required this.name,
-    required this.properties,
-  })   : assert(hasValue(name) && hasValue(properties)),
+    this.properties = const [],
+  })  : assert(hasValue(name.name)),
         super(name: name);
 
   @override

lib/generator/ephemeral_data.dart

@@ -74,7 +74,7 @@ class Context {
   final Name? currentFieldName;
 
   /// If part of an union type, which [TypeDefinitionNode] it represents.
-  final TypeDefinitionNode? ofUnion;
+  final Name? ofUnion;
 
   /// A string to replace the current class name.
   final Name? alias;
@@ -114,7 +114,7 @@ class Context {
     required TypeDefinitionNode nextType,
     required Name? nextFieldName,
     required Name? nextClassName,
-    Nullable<TypeDefinitionNode?>? ofUnion,
+    Nullable<Name?>? ofUnion,
     Name? alias,
     List<Definition>? generatedClasses,
     List<QueryInput>? inputsClasses,
@@ -143,7 +143,7 @@ class Context {
     Name? nextFieldName,
     Name? nextClassName,
     Name? alias,
-    Nullable<TypeDefinitionNode?>? ofUnion,
+    Nullable<Name?>? ofUnion,
     List<Definition>? generatedClasses,
     List<QueryInput>? inputsClasses,
     List<FragmentDefinitionNode>? fragments,
@@ -203,7 +203,7 @@ class Context {
     Name? nextFieldName,
     Name? nextClassName,
     Name? alias,
-    Nullable<TypeDefinitionNode?>? ofUnion,
+    Nullable<Name?>? ofUnion,
     List<Definition>? generatedClasses,
     List<QueryInput>? inputsClasses,
     List<FragmentDefinitionNode>? fragments,
@@ -261,7 +261,7 @@ class Context {
   /// Returns a copy of this context, with the same type, but on the first path.
   Context sameTypeWithNoPath({
     Name? alias,
-    Nullable<TypeDefinitionNode?>? ofUnion,
+    Nullable<Name?>? ofUnion,
     List<Definition>? generatedClasses,
     List<QueryInput>? inputsClasses,
     List<FragmentDefinitionNode>? fragments,
@@ -289,7 +289,7 @@ class Context {
     required TypeDefinitionNode nextType,
     required Name nextFieldName,
     required Name nextClassName,
-    Nullable<TypeDefinitionNode?>? ofUnion,
+    Nullable<Name?>? ofUnion,
     Name? alias,
     List<Definition>? generatedClasses,
     List<QueryInput>? inputsClasses,

lib/visitor/canonical_visitor.dart

@@ -29,7 +29,7 @@ class CanonicalVisitor extends RecursiveVisitor {
 
     final nextContext = context.sameTypeWithNoPath(
       alias: enumName,
-      ofUnion: Nullable<TypeDefinitionNode?>(null),
+      ofUnion: Nullable<Name?>(null),
     );
 
     logFn(context, nextContext.align, '-> Enum');
@@ -53,7 +53,7 @@ class CanonicalVisitor extends RecursiveVisitor {
     final name = ClassName(name: node.name.value);
     final nextContext = context.sameTypeWithNoPath(
       alias: name,
-      ofUnion: Nullable<TypeDefinitionNode?>(null),
+      ofUnion: Nullable<Name?>(null),
     );
 
     logFn(context, nextContext.align, '-> Input class');
@@ -69,7 +69,7 @@ class CanonicalVisitor extends RecursiveVisitor {
           nextType: node,
           nextClassName: ClassName(name: nextType.name.value),
           nextFieldName: ClassName(name: i.name.value),
-          ofUnion: Nullable<TypeDefinitionNode?>(null),
+          ofUnion: Nullable<Name?>(null),
         ),
         markAsUsed: false,
       );

lib/visitor/generator_visitor.dart

@@ -52,22 +52,20 @@ class GeneratorVisitor extends RecursiveVisitor {
       possibleTypes.addAll(Map.fromIterables(keys, values));
     }
 
-    final partOfUnion = nextContext.ofUnion != null;
-    if (partOfUnion) {}
-
     final name = ClassName.fromPath(path: nextContext.fullPathName());
     logFn(context, nextContext.align,
         '└ ${nextContext.path}[${nextContext.currentType!.name.value}][${nextContext.currentClassName} ${nextContext.currentFieldName}] (${nextContext.alias ?? ''})');
     logFn(context, nextContext.align,
         '<- Generated class ${name.namePrintable}.');
-
+    final ofUnion = context.ofUnion;
+    if (ofUnion is FragmentName) {
+      _mixins.add(ofUnion);
+    }
     nextContext.generatedClasses.add(ClassDefinition(
       name: name,
       properties: _classProperties,
       mixins: _mixins,
-      extension: partOfUnion
-          ? ClassName.fromPath(path: nextContext.rollbackPath().fullPathName())
-          : null,
+      extension: ofUnion is ClassName ? ofUnion : null,
       factoryPossibilities: possibleTypes,
     ));
   }
@@ -94,15 +92,16 @@ class GeneratorVisitor extends RecursiveVisitor {
   void visitInlineFragmentNode(InlineFragmentNode node) {
     logFn(context, context.align + 1,
         '${context.path}: ... on ${node.typeCondition!.on.name.value}');
+    final ofUnion = context.ofUnion ??
+        ClassName.fromPath(path: context.rollbackPath().fullPathName());
     final nextType = gql.getTypeByName(context.schema, node.typeCondition!.on);
-
     if (nextType.name.value == context.currentType!.name.value) {
       final visitor = GeneratorVisitor(
         context: context.nextTypeWithSamePath(
           nextType: nextType,
           nextClassName: null,
           nextFieldName: null,
-          ofUnion: Nullable<TypeDefinitionNode?>(context.currentType),
+          ofUnion: Nullable<Name?>(ofUnion),
           inputsClasses: [],
           fragments: [],
         ),
@@ -114,7 +113,7 @@ class GeneratorVisitor extends RecursiveVisitor {
           nextType: nextType,
           nextClassName: ClassName(name: nextType.name.value),
           nextFieldName: ClassPropertyName(name: nextType.name.value),
-          ofUnion: Nullable<TypeDefinitionNode?>(context.currentType),
+          ofUnion: Nullable<Name?>(ofUnion),
           inputsClasses: [],
           fragments: [],
         ),
@@ -149,7 +148,7 @@ class GeneratorVisitor extends RecursiveVisitor {
           nextType: leafType,
           nextClassName: ClassName(name: leafType.name.value),
           nextFieldName: ClassName(name: node.variable.name.value),
-          ofUnion: Nullable<TypeDefinitionNode?>(null),
+          ofUnion: Nullable<Name?>(null),
         )
         .fullPathName();
 
@@ -234,15 +233,15 @@ class GeneratorVisitor extends RecursiveVisitor {
         path: context
             .sameTypeWithNoPath(
               alias: FragmentName(name: node.name.value),
-              ofUnion: Nullable<TypeDefinitionNode?>(null),
+              ofUnion: Nullable<Name?>(null),
             )
             .fullPathName());
 
     final visitor = GeneratorVisitor(
       context: context.sameTypeWithNextPath(
         alias: fragmentName,
         generatedClasses: [],
-        ofUnion: Nullable<TypeDefinitionNode?>(null),
+        ofUnion: Nullable<Name?>(null),
         log: false,
       ),
     );
@@ -260,7 +259,7 @@ class GeneratorVisitor extends RecursiveVisitor {
     final partName = FragmentName(name: node.name.value);
     final nextContext = context.sameTypeWithNoPath(
       alias: partName,
-      ofUnion: Nullable<TypeDefinitionNode?>(null),
+      ofUnion: Nullable<Name?>(null),
     );
 
     logFn(context, nextContext.align, '-> Fragment');
@@ -270,6 +269,8 @@ class GeneratorVisitor extends RecursiveVisitor {
 
     final nextType =
         gql.getTypeByName(nextContext.schema, node.typeCondition.on);
+    final fragmentName =
+        FragmentName.fromPath(path: nextContext.fullPathName());
 
     final visitorContext = Context(
       schema: context.schema,
@@ -285,6 +286,7 @@ class GeneratorVisitor extends RecursiveVisitor {
       fragments: [],
       usedEnums: nextContext.usedEnums,
       usedInputObjects: nextContext.usedInputObjects,
+      ofUnion: fragmentName,
     );
 
     final visitor = GeneratorVisitor(context: visitorContext);
@@ -298,8 +300,6 @@ class GeneratorVisitor extends RecursiveVisitor {
         .expand((a) => a)
         .mergeDuplicatesBy((a) => a.name, (a, b) => a);
 
-    final fragmentName =
-        FragmentName.fromPath(path: nextContext.fullPathName());
     logFn(context, nextContext.align,
         '└ ${nextContext.path}[${node.name.value}]');
     logFn(context, nextContext.align,

pubspec.yaml

@@ -1,5 +1,5 @@
 name: artemis
-version: 7.0.0-beta.11
+version: 7.0.0-beta.12
 
 description: Build dart types from GraphQL schemas and queries (using Introspection Query).
 homepage: https://github.com/comigor/artemis