Merge pull request #1330 from nextcloud/refactor/dynamite/prefix-clie…

…nts-with-$ refactor(dynamite)!: rename prefix clients with $ to avoid naming con…
nextcloud · Dec 20, 2023 · 5a80232 · 5a80232
2 parents d51e55e + fcf97ee
commit 5a80232
Show file tree

Hide file tree

Showing 53 changed files with 431 additions and 431 deletions.
diff --git a/packages/dynamite/dynamite/lib/src/builder/client.dart b/packages/dynamite/dynamite/lib/src/builder/client.dart
@@ -38,7 +38,7 @@ Class buildRootClient(
       (final b) {
         b
           ..extend = refer('DynamiteClient')
-          ..name = 'Client'
+          ..name = r'$Client'
           ..docs.addAll(spec.formattedTagsFor(null))
           ..constructors.addAll([
             Constructor(
@@ -154,7 +154,7 @@ Class buildClient(
             Field(
               (final b) => b
                 ..name = '_rootClient'
-                ..type = refer('Client')
+                ..type = refer(r'$Client')
                 ..modifier = FieldModifier.final$,
             ),
           );

diff --git a/packages/dynamite/dynamite/lib/src/helpers/dynamite.dart b/packages/dynamite/dynamite/lib/src/helpers/dynamite.dart
@@ -15,7 +15,7 @@ String filterMethodName(final String operationId, final String tag) {
   return output.join('-');
 }
 
-String clientName(final String tag) => '${toDartName(tag, uppercaseFirstCharacter: true)}Client';
+String clientName(final String tag) => '\$${toDartName(tag, uppercaseFirstCharacter: true)}Client';
 
 bool isDartParameterNullable(
   final bool required,

diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/headers.openapi.dart b/packages/dynamite/dynamite_end_to_end_test/lib/headers.openapi.dart
@@ -16,16 +16,16 @@ import 'package:universal_io/io.dart';
 
 part 'headers.openapi.g.dart';
 
-class Client extends DynamiteClient {
-  Client(
+class $Client extends DynamiteClient {
+  $Client(
     super.baseURL, {
     super.baseHeaders,
     super.userAgent,
     super.httpClient,
     super.cookieJar,
   });
 
-  Client.fromClient(DynamiteClient client)
+  $Client.fromClient(DynamiteClient client)
       : super(
           client.baseURL,
           baseHeaders: client.baseHeaders,

diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/parameters.openapi.dart b/packages/dynamite/dynamite_end_to_end_test/lib/parameters.openapi.dart
@@ -21,16 +21,16 @@ import 'package:uri/uri.dart';
 
 part 'parameters.openapi.g.dart';
 
-class Client extends DynamiteClient {
-  Client(
+class $Client extends DynamiteClient {
+  $Client(
     super.baseURL, {
     super.baseHeaders,
     super.userAgent,
     super.httpClient,
     super.cookieJar,
   });
 
-  Client.fromClient(DynamiteClient client)
+  $Client.fromClient(DynamiteClient client)
       : super(
           client.baseURL,
           baseHeaders: client.baseHeaders,

diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/request_body.openapi.dart b/packages/dynamite/dynamite_end_to_end_test/lib/request_body.openapi.dart
@@ -14,16 +14,16 @@ import 'package:dynamite_runtime/http_client.dart';
 import 'package:meta/meta.dart';
 import 'package:universal_io/io.dart';
 
-class Client extends DynamiteClient {
-  Client(
+class $Client extends DynamiteClient {
+  $Client(
     super.baseURL, {
     super.baseHeaders,
     super.userAgent,
     super.httpClient,
     super.cookieJar,
   });
 
-  Client.fromClient(DynamiteClient client)
+  $Client.fromClient(DynamiteClient client)
       : super(
           client.baseURL,
           baseHeaders: client.baseHeaders,

diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/responses.openapi.dart b/packages/dynamite/dynamite_end_to_end_test/lib/responses.openapi.dart
@@ -12,16 +12,16 @@ import 'package:dynamite_runtime/http_client.dart';
 import 'package:meta/meta.dart';
 import 'package:universal_io/io.dart';
 
-class Client extends DynamiteClient {
-  Client(
+class $Client extends DynamiteClient {
+  $Client(
     super.baseURL, {
     super.baseHeaders,
     super.userAgent,
     super.httpClient,
     super.cookieJar,
   });
 
-  Client.fromClient(DynamiteClient client)
+  $Client.fromClient(DynamiteClient client)
       : super(
           client.baseURL,
           baseHeaders: client.baseHeaders,

diff --git a/packages/dynamite/dynamite_end_to_end_test/test/parameters_test.dart b/packages/dynamite/dynamite_end_to_end_test/test/parameters_test.dart
@@ -20,7 +20,7 @@ class MockHttpOverrides extends HttpOverrides {
 }
 
 void main() {
-  late Client client;
+  late $Client client;
   late MockHttpHeaders headers;
   late MockHttpClientResponse response;
   late MockHttpClientRequest request;
@@ -43,7 +43,7 @@ void main() {
       return Future.value(request);
     });
 
-    client = Client(Uri.parse('example.com'));
+    client = $Client(Uri.parse('example.com'));
   });
 
   group(r'$get', () {

diff --git a/packages/dynamite/dynamite_petstore_example/lib/petstore.openapi.dart b/packages/dynamite/dynamite_petstore_example/lib/petstore.openapi.dart
@@ -18,16 +18,16 @@ import 'package:uri/uri.dart';
 
 part 'petstore.openapi.g.dart';
 
-class Client extends DynamiteClient {
-  Client(
+class $Client extends DynamiteClient {
+  $Client(
     super.baseURL, {
     super.baseHeaders,
     super.userAgent,
     super.httpClient,
     super.cookieJar,
   });
 
-  Client.fromClient(DynamiteClient client)
+  $Client.fromClient(DynamiteClient client)
       : super(
           client.baseURL,
           baseHeaders: client.baseHeaders,

diff --git a/packages/nextcloud/bin/generate_exports.dart b/packages/nextcloud/bin/generate_exports.dart
@@ -29,7 +29,7 @@ void main() {
       exports.add("export 'src/helpers/$id.dart';");
     }
 
-    if (!file.readAsStringSync().contains('class Client extends DynamiteClient {')) {
+    if (!file.readAsStringSync().contains(r'class $Client extends DynamiteClient {')) {
       File('lib/$id.dart').writeAsStringSync(exports.join('\n'));
       continue;
     }
@@ -43,10 +43,10 @@ ${exports.join('\n')}
 
 // ignore: public_member_api_docs
 extension ${classPrefix}Extension on NextcloudClient {
-  static final _$variablePrefix = Expando<Client>();
+  static final _$variablePrefix = Expando<\$Client>();
 
   /// Client for the $id APIs
-  Client get $variablePrefix => _$variablePrefix[this] ??= Client.fromClient(this);
+  \$Client get $variablePrefix => _$variablePrefix[this] ??= \$Client.fromClient(this);
 }
 ''');
   }

diff --git a/packages/nextcloud/lib/core.dart b/packages/nextcloud/lib/core.dart
@@ -7,8 +7,8 @@ export 'src/helpers/core.dart';
 
 // ignore: public_member_api_docs
 extension CoreExtension on NextcloudClient {
-  static final _core = Expando<Client>();
+  static final _core = Expando<$Client>();
 
   /// Client for the core APIs
-  Client get core => _core[this] ??= Client.fromClient(this);
+  $Client get core => _core[this] ??= $Client.fromClient(this);
 }
diff --git a/packages/nextcloud/lib/dashboard.dart b/packages/nextcloud/lib/dashboard.dart
@@ -6,8 +6,8 @@ export 'src/api/dashboard.openapi.dart';
 
 // ignore: public_member_api_docs
 extension DashboardExtension on NextcloudClient {
-  static final _dashboard = Expando<Client>();
+  static final _dashboard = Expando<$Client>();
 
   /// Client for the dashboard APIs
-  Client get dashboard => _dashboard[this] ??= Client.fromClient(this);
+  $Client get dashboard => _dashboard[this] ??= $Client.fromClient(this);
 }
diff --git a/packages/nextcloud/lib/dav.dart b/packages/nextcloud/lib/dav.dart
@@ -6,8 +6,8 @@ export 'src/api/dav.openapi.dart';
 
 // ignore: public_member_api_docs
 extension DavExtension on NextcloudClient {
-  static final _dav = Expando<Client>();
+  static final _dav = Expando<$Client>();
 
   /// Client for the dav APIs
-  Client get dav => _dav[this] ??= Client.fromClient(this);
+  $Client get dav => _dav[this] ??= $Client.fromClient(this);
 }
diff --git a/packages/nextcloud/lib/files.dart b/packages/nextcloud/lib/files.dart
@@ -6,8 +6,8 @@ export 'src/api/files.openapi.dart';
 
 // ignore: public_member_api_docs
 extension FilesExtension on NextcloudClient {
-  static final _files = Expando<Client>();
+  static final _files = Expando<$Client>();
 
   /// Client for the files APIs
-  Client get files => _files[this] ??= Client.fromClient(this);
+  $Client get files => _files[this] ??= $Client.fromClient(this);
 }
diff --git a/packages/nextcloud/lib/files_external.dart b/packages/nextcloud/lib/files_external.dart
@@ -6,8 +6,8 @@ export 'src/api/files_external.openapi.dart';
 
 // ignore: public_member_api_docs
 extension FilesExternalExtension on NextcloudClient {
-  static final _filesExternal = Expando<Client>();
+  static final _filesExternal = Expando<$Client>();
 
   /// Client for the files_external APIs
-  Client get filesExternal => _filesExternal[this] ??= Client.fromClient(this);
+  $Client get filesExternal => _filesExternal[this] ??= $Client.fromClient(this);
 }
diff --git a/packages/nextcloud/lib/files_reminders.dart b/packages/nextcloud/lib/files_reminders.dart
@@ -6,8 +6,8 @@ export 'src/api/files_reminders.openapi.dart';
 
 // ignore: public_member_api_docs
 extension FilesRemindersExtension on NextcloudClient {
-  static final _filesReminders = Expando<Client>();
+  static final _filesReminders = Expando<$Client>();
 
   /// Client for the files_reminders APIs
-  Client get filesReminders => _filesReminders[this] ??= Client.fromClient(this);
+  $Client get filesReminders => _filesReminders[this] ??= $Client.fromClient(this);
 }
diff --git a/packages/nextcloud/lib/files_sharing.dart b/packages/nextcloud/lib/files_sharing.dart
@@ -6,8 +6,8 @@ export 'src/api/files_sharing.openapi.dart';
 
 // ignore: public_member_api_docs
 extension FilesSharingExtension on NextcloudClient {
-  static final _filesSharing = Expando<Client>();
+  static final _filesSharing = Expando<$Client>();
 
   /// Client for the files_sharing APIs
-  Client get filesSharing => _filesSharing[this] ??= Client.fromClient(this);
+  $Client get filesSharing => _filesSharing[this] ??= $Client.fromClient(this);
 }
diff --git a/packages/nextcloud/lib/files_trashbin.dart b/packages/nextcloud/lib/files_trashbin.dart
@@ -6,8 +6,8 @@ export 'src/api/files_trashbin.openapi.dart';
 
 // ignore: public_member_api_docs
 extension FilesTrashbinExtension on NextcloudClient {
-  static final _filesTrashbin = Expando<Client>();
+  static final _filesTrashbin = Expando<$Client>();
 
   /// Client for the files_trashbin APIs
-  Client get filesTrashbin => _filesTrashbin[this] ??= Client.fromClient(this);
+  $Client get filesTrashbin => _filesTrashbin[this] ??= $Client.fromClient(this);
 }
diff --git a/packages/nextcloud/lib/files_versions.dart b/packages/nextcloud/lib/files_versions.dart
@@ -6,8 +6,8 @@ export 'src/api/files_versions.openapi.dart';
 
 // ignore: public_member_api_docs
 extension FilesVersionsExtension on NextcloudClient {
-  static final _filesVersions = Expando<Client>();
+  static final _filesVersions = Expando<$Client>();
 
   /// Client for the files_versions APIs
-  Client get filesVersions => _filesVersions[this] ??= Client.fromClient(this);
+  $Client get filesVersions => _filesVersions[this] ??= $Client.fromClient(this);
 }
diff --git a/packages/nextcloud/lib/news.dart b/packages/nextcloud/lib/news.dart
@@ -7,8 +7,8 @@ export 'src/helpers/news.dart';
 
 // ignore: public_member_api_docs
 extension NewsExtension on NextcloudClient {
-  static final _news = Expando<Client>();
+  static final _news = Expando<$Client>();
 
   /// Client for the news APIs
-  Client get news => _news[this] ??= Client.fromClient(this);
+  $Client get news => _news[this] ??= $Client.fromClient(this);
 }
diff --git a/packages/nextcloud/lib/notes.dart b/packages/nextcloud/lib/notes.dart
@@ -7,8 +7,8 @@ export 'src/helpers/notes.dart';
 
 // ignore: public_member_api_docs
 extension NotesExtension on NextcloudClient {
-  static final _notes = Expando<Client>();
+  static final _notes = Expando<$Client>();
 
   /// Client for the notes APIs
-  Client get notes => _notes[this] ??= Client.fromClient(this);
+  $Client get notes => _notes[this] ??= $Client.fromClient(this);
 }
diff --git a/packages/nextcloud/lib/notifications.dart b/packages/nextcloud/lib/notifications.dart
@@ -7,8 +7,8 @@ export 'src/helpers/notifications.dart';
 
 // ignore: public_member_api_docs
 extension NotificationsExtension on NextcloudClient {
-  static final _notifications = Expando<Client>();
+  static final _notifications = Expando<$Client>();
 
   /// Client for the notifications APIs
-  Client get notifications => _notifications[this] ??= Client.fromClient(this);
+  $Client get notifications => _notifications[this] ??= $Client.fromClient(this);
 }
diff --git a/packages/nextcloud/lib/provisioning_api.dart b/packages/nextcloud/lib/provisioning_api.dart
@@ -6,8 +6,8 @@ export 'src/api/provisioning_api.openapi.dart';
 
 // ignore: public_member_api_docs
 extension ProvisioningApiExtension on NextcloudClient {
-  static final _provisioningApi = Expando<Client>();
+  static final _provisioningApi = Expando<$Client>();
 
   /// Client for the provisioning_api APIs
-  Client get provisioningApi => _provisioningApi[this] ??= Client.fromClient(this);
+  $Client get provisioningApi => _provisioningApi[this] ??= $Client.fromClient(this);
 }
diff --git a/packages/nextcloud/lib/settings.dart b/packages/nextcloud/lib/settings.dart
@@ -6,8 +6,8 @@ export 'src/api/settings.openapi.dart';
 
 // ignore: public_member_api_docs
 extension SettingsExtension on NextcloudClient {
-  static final _settings = Expando<Client>();
+  static final _settings = Expando<$Client>();
 
   /// Client for the settings APIs
-  Client get settings => _settings[this] ??= Client.fromClient(this);
+  $Client get settings => _settings[this] ??= $Client.fromClient(this);
 }
diff --git a/packages/nextcloud/lib/spreed.dart b/packages/nextcloud/lib/spreed.dart
@@ -7,8 +7,8 @@ export 'src/helpers/spreed.dart';
 
 // ignore: public_member_api_docs
 extension SpreedExtension on NextcloudClient {
-  static final _spreed = Expando<Client>();
+  static final _spreed = Expando<$Client>();
 
   /// Client for the spreed APIs
-  Client get spreed => _spreed[this] ??= Client.fromClient(this);
+  $Client get spreed => _spreed[this] ??= $Client.fromClient(this);
 }