Merge pull request #1946 from nextcloud/perf/dynamite/memoize_cpec_ge…

…tters perf(dynamite): use memoization for for better performance
nextcloud · Apr 22, 2024 · 7776b63 · 7776b63
2 parents 0d8c5ee + b25c408
commit 7776b63
Show file tree

Hide file tree

Showing 13 changed files with 92 additions and 9 deletions.
diff --git a/packages/dynamite/dynamite/lib/src/builder/client.dart b/packages/dynamite/dynamite/lib/src/builder/client.dart
@@ -634,11 +634,8 @@ final authentication = $client.authentications?.firstWhereOrNull(
     ..writeAll(
       securityRequirements.map((requirement) {
         final securityScheme = spec.components!.securitySchemes![requirement.keys.single]!;
-        final dynamiteAuth = toDartName(
-          'Dynamite-${securityScheme.fullName.join('-')}-Authentication',
-          className: true,
-        );
-        return refer(dynamiteAuth, 'package:dynamite_runtime/http_client.dart')
+
+        return refer(securityScheme.fullName, 'package:dynamite_runtime/http_client.dart')
             .newInstance(const [])
             .accept(state.emitter)
             .toString();

diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/open_api.dart b/packages/dynamite/dynamite/lib/src/models/openapi/open_api.dart
@@ -33,6 +33,7 @@ abstract class OpenAPI implements Built<OpenAPI, OpenAPIBuilder> {
 
   BuiltMap<String, PathItem>? get paths;
 
+  @memoized
   bool get hasAnySecurity => components?.securitySchemes?.isNotEmpty ?? false;
 
   @BuiltValueHook(finalizeBuilder: true)

diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/open_api.g.dart b/packages/dynamite/dynamite/lib/src/models/openapi/open_api.g.dart
diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/parameter.dart b/packages/dynamite/dynamite/lib/src/models/openapi/parameter.dart
@@ -39,6 +39,7 @@ abstract class Parameter implements Built<Parameter, ParameterBuilder> {
 
   ParameterStyle get style;
 
+  @memoized
   Schema? get schema {
     if ($schema != null) {
       return $schema;
@@ -178,6 +179,7 @@ abstract class Parameter implements Built<Parameter, ParameterBuilder> {
     }
   }
 
+  @memoized
   String get formattedDescription {
     final name = toDartName(this.name);
     final buffer = StringBuffer()..write('  * [$name]');

diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/parameter.g.dart b/packages/dynamite/dynamite/lib/src/models/openapi/parameter.g.dart
diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/path_item.dart b/packages/dynamite/dynamite/lib/src/models/openapi/path_item.dart
@@ -34,6 +34,7 @@ abstract class PathItem implements Built<PathItem, PathItemBuilder> {
 
   Operation? get trace;
 
+  @memoized
   Map<PathItemOperation, Operation> get operations => <PathItemOperation, Operation>{
         if (get != null) PathItemOperation.get: get!,
         if (put != null) PathItemOperation.put: put!,

diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/path_item.g.dart b/packages/dynamite/dynamite/lib/src/models/openapi/path_item.g.dart
diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/schema.dart b/packages/dynamite/dynamite/lib/src/models/openapi/schema.dart
@@ -63,9 +63,10 @@ abstract class Schema implements Built<Schema, SchemaBuilder> {
 
   bool get nullable;
 
-  bool get isContentString =>
-      type == SchemaType.string && (contentMediaType?.isNotEmpty ?? false) && contentSchema != null;
+  @memoized
+  bool get isContentString => type == SchemaType.string && contentMediaType != null && contentSchema != null;
 
+  @memoized
   String? get formattedDescription => formatDescription(description);
 
   @BuiltValueHook(finalizeBuilder: true)

diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/schema.g.dart b/packages/dynamite/dynamite/lib/src/models/openapi/schema.g.dart
diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/security_scheme.dart b/packages/dynamite/dynamite/lib/src/models/openapi/security_scheme.dart
@@ -1,6 +1,6 @@
 import 'package:built_value/built_value.dart';
 import 'package:built_value/serializer.dart';
-import 'package:collection/collection.dart';
+import 'package:dynamite/src/helpers/dart_helpers.dart';
 
 part 'security_scheme.g.dart';
 
@@ -22,5 +22,32 @@ abstract class SecurityScheme implements Built<SecurityScheme, SecuritySchemeBui
 
   String? get name;
 
-  Iterable<String> get fullName => [type, scheme, $in, name].whereNotNull();
+  @memoized
+  String get fullName {
+    final buffer = StringBuffer('Dynamite-')
+      ..write(type)
+      ..write('-');
+
+    if (scheme != null) {
+      buffer
+        ..write(scheme)
+        ..write('-');
+    }
+    if ($in != null) {
+      buffer
+        ..write($in)
+        ..write('-');
+    }
+    if (name != null) {
+      buffer
+        ..write(name)
+        ..write('-');
+    }
+    buffer.write('-Authentication');
+
+    return toDartName(
+      buffer.toString(),
+      className: true,
+    );
+  }
 }
diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/security_scheme.g.dart b/packages/dynamite/dynamite/lib/src/models/openapi/security_scheme.g.dart
diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/tag.dart b/packages/dynamite/dynamite/lib/src/models/openapi/tag.dart
@@ -16,5 +16,6 @@ abstract class Tag implements Built<Tag, TagBuilder> {
   @BuiltValueField(compare: false)
   String? get description;
 
+  @memoized
   String? get formattedDescription => formatDescription(description);
 }
diff --git a/packages/dynamite/dynamite/lib/src/models/openapi/tag.g.dart b/packages/dynamite/dynamite/lib/src/models/openapi/tag.g.dart