Fix/dynamite/nested ofs

packages/dynamite/dynamite/lib/src/builder/ofs_builder.dart

@@ -53,10 +53,13 @@ TypeResult resolveAllOf(
       interfaces.add(interfaceClass);
     }
 
+    state.output.add(
+      buildInterface(identifier, interfaces: interfaces),
+    );
+
     state.output.add(
       buildBuiltClass(
         identifier,
-        interfaces: interfaces,
       ),
     );
   }
@@ -99,7 +102,7 @@ TypeResult resolveOfs(
     }
 
     state.output.addAll([
-      buildBuiltClass(
+      buildInterface(
         identifier,
         methods: BuiltList.build((final b) {
           b.add(
@@ -128,6 +131,9 @@ TypeResult resolveOfs(
             );
           }
         }),
+      ),
+      buildBuiltClass(
+        identifier,
         customSerializer: true,
       ),
       Class(

packages/dynamite/dynamite/lib/src/builder/resolve_interface.dart

@@ -1,3 +1,4 @@
+import 'package:built_collection/built_collection.dart';
 import 'package:code_builder/code_builder.dart';
 import 'package:dynamite/src/builder/resolve_type.dart';
 import 'package:dynamite/src/builder/state.dart';
@@ -18,18 +19,11 @@ TypeResultObject resolveInterface(
   );
 
   if (state.resolvedInterfaces.add(result)) {
-    final className = '$identifier$interfaceSuffix';
-
-    state.output.add(
-      Class((final b) {
-        b
-          ..abstract = true
-          ..modifier = ClassModifier.interface
-          ..name = className
-          ..annotations.add(refer('BuiltValue').call([], {'instantiable': literalFalse}));
-
+    final $interface = buildInterface(
+      identifier,
+      methods: BuiltList.build((final b) {
         for (final property in schema.properties!.entries) {
-          b.methods.add(
+          b.add(
             Method(
               (final b) {
                 final propertyName = property.key;
@@ -62,29 +56,38 @@ TypeResultObject resolveInterface(
             ),
           );
         }
-
-        b.methods.addAll([
-          Method(
-            (final b) => b
-              ..returns = refer(className)
-              ..name = 'rebuild'
-              ..requiredParameters.add(
-                Parameter(
-                  (final b) => b
-                    ..name = 'updates'
-                    ..type = refer('void Function(${className}Builder)'),
-                ),
-              ),
-          ),
-          Method(
-            (final b) => b
-              ..returns = refer('${className}Builder')
-              ..name = 'toBuilder',
-          ),
-        ]);
       }),
     );
+
+    state.output.add($interface);
   }
 
   return result;
 }
+
+Spec buildInterface(
+  final String identifier, {
+  final BuiltList<Method>? methods,
+  final Iterable<TypeResultObject>? interfaces,
+}) {
+  assert((interfaces == null) != (methods == null), 'Either provide an interface or methods.');
+  final className = '$identifier$interfaceSuffix';
+
+  return Class((final b) {
+    b
+      ..abstract = true
+      ..modifier = ClassModifier.interface
+      ..name = className
+      ..annotations.add(refer('BuiltValue').call([], {'instantiable': literalFalse}));
+
+    if (interfaces != null) {
+      b.implements.addAll(
+        interfaces.map((final i) => refer('${i.name}$interfaceSuffix')),
+      );
+    }
+
+    if (methods != null) {
+      b.methods.addAll(methods);
+    }
+  });
+}

packages/dynamite/dynamite/lib/src/builder/resolve_object.dart

@@ -36,23 +36,21 @@ TypeResultObject resolveObject(
       }
     }
 
-    final interfaceClass = resolveInterface(
+    resolveInterface(
       spec,
       state,
       identifier,
       schema,
     );
 
-    state.output.addAll([
+    state.output.add(
       buildBuiltClass(
         identifier,
         defaults: defaults,
         customSerializer: isHeader,
-        interfaces: [
-          interfaceClass,
-        ],
       ),
-    ]);
+    );
+
     if (isHeader) {
       state.output.add(buildHeaderSerializer(state, identifier, spec, schema));
     }

packages/dynamite/dynamite/lib/src/helpers/built_value.dart

@@ -1,73 +1,68 @@
-import 'package:built_collection/built_collection.dart';
 import 'package:code_builder/code_builder.dart';
 import 'package:dynamite/src/helpers/dart_helpers.dart';
-import 'package:dynamite/src/models/type_result.dart';
 
 const interfaceSuffix = 'Interface';
 
+/// Builds a [Class] representing a built_value object.
+///
+/// Attributes must be defined in a separate interface called `$className$interfaceSuffix`.
 Spec buildBuiltClass(
   final String className, {
-  final BuiltList<Method>? methods,
   final Iterable<String>? defaults,
-  final Iterable<TypeResultObject>? interfaces,
   final bool customSerializer = false,
-}) {
-  assert((interfaces == null) != (methods == null), 'Either provide an interface or methods.');
+}) =>
+    Class(
+      (final b) {
+        b
+          ..name = className
+          ..abstract = true
+          ..implements.addAll([
+            refer('$className$interfaceSuffix'),
+            refer(
+              'Built<$className, ${className}Builder>',
+            ),
+          ])
+          ..constructors.addAll([
+            builtValueConstructor(className),
+            hiddenConstructor,
+            fromJsonConstructor,
+          ])
+          ..methods.addAll([
+            toJsonMethod,
+            buildSerializer(className, isCustom: customSerializer),
+          ]);
 
-  return Class(
-    (final b) {
-      b
-        ..name = className
-        ..abstract = true
-        ..implements.addAll([
-          ...?interfaces?.map((final i) => refer('${i.name}$interfaceSuffix')),
-          refer(
-            'Built<$className, ${className}Builder>',
-          ),
-        ])
-        ..constructors.addAll([
-          builtValueConstructor(className),
-          hiddenConstructor,
-          fromJsonConstructor,
-        ])
-        ..methods.addAll([
-          toJsonMethod,
-          ...?methods,
-          buildSerializer(className, isCustom: customSerializer),
-        ]);
-
-      if (defaults != null && defaults.isNotEmpty) {
-        b.methods.add(
-          Method(
-            (final b) => b
-              ..name = '_defaults'
-              ..returns = refer('void')
-              ..static = true
-              ..lambda = true
-              ..annotations.add(
-                refer('BuiltValueHook').call([], {
-                  'initializeBuilder': literalTrue,
-                }),
-              )
-              ..requiredParameters.add(
-                Parameter(
-                  (final b) => b
-                    ..name = 'b'
-                    ..type = refer('${className}Builder'),
+        if (defaults != null && defaults.isNotEmpty) {
+          b.methods.add(
+            Method(
+              (final b) => b
+                ..name = '_defaults'
+                ..returns = refer('void')
+                ..static = true
+                ..lambda = true
+                ..annotations.add(
+                  refer('BuiltValueHook').call([], {
+                    'initializeBuilder': literalTrue,
+                  }),
+                )
+                ..requiredParameters.add(
+                  Parameter(
+                    (final b) => b
+                      ..name = 'b'
+                      ..type = refer('${className}Builder'),
+                  ),
+                )
+                ..body = Code(
+                  <String?>[
+                    'b',
+                    ...defaults,
+                  ].join(),
                 ),
-              )
-              ..body = Code(
-                <String?>[
-                  'b',
-                  ...defaults,
-                ].join(),
-              ),
-          ),
-        );
-      }
-    },
-  );
-}
+            ),
+          );
+        }
+      },
+    );
 
 Method get toJsonMethod => Method(
       (final b) => b

packages/nextcloud/lib/src/api/comments.openapi.dart

@@ -34,8 +34,6 @@ class Client extends DynamiteClient {
 @BuiltValue(instantiable: false)
 abstract interface class Capabilities_FilesInterface {
   bool get comments;
-  Capabilities_FilesInterface rebuild(final void Function(Capabilities_FilesInterfaceBuilder) updates);
-  Capabilities_FilesInterfaceBuilder toBuilder();
 }
 
 abstract class Capabilities_Files
@@ -61,8 +59,6 @@ abstract class Capabilities_Files
 @BuiltValue(instantiable: false)
 abstract interface class CapabilitiesInterface {
   Capabilities_Files get files;
-  CapabilitiesInterface rebuild(final void Function(CapabilitiesInterfaceBuilder) updates);
-  CapabilitiesInterfaceBuilder toBuilder();
 }
 
 abstract class Capabilities implements CapabilitiesInterface, Built<Capabilities, CapabilitiesBuilder> {