Refactor code to remove @internal annotations and update imports

PlugFox · May 3, 2024 · 200b2f9 · 200b2f9
1 parent f5b6d91
commit 200b2f9
Show file tree

Hide file tree

Showing 34 changed files with 342 additions and 190 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -38,7 +38,7 @@ analyzer:
     empty_catches: warning
 
     # Error
-    always_use_package_imports: error
+    prefer_relative_imports: error
     avoid_relative_lib_imports: error
     avoid_slow_async_io: error
     avoid_types_as_parameter_names: error
@@ -52,12 +52,12 @@ linter:
     lines_longer_than_80_chars: true
 
     # Enabling rules
-    always_use_package_imports: true
+    prefer_relative_imports: true
     avoid_relative_lib_imports: true
 
     # Disable rules
     sort_pub_dependencies: false
-    prefer_relative_imports: false
+    always_use_package_imports: false
     prefer_final_locals: false
     avoid_escaping_inner_quotes: false
     curly_braces_in_flow_control_structures: false

diff --git a/lib/spinify.dart b/lib/spinify.dart
@@ -0,0 +1 @@
+library spinify;
diff --git a/lib/spinify.old.dart b/lib/spinify.old.dart
@@ -1,4 +1,4 @@
-library spinify;
+library spinify.old;
 
 export 'src.old/client/config.dart';
 export 'src.old/client/observer.dart';

diff --git a/lib/src.old/client/config.dart b/lib/src.old/client/config.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:meta/meta.dart';
-import 'package:spinify/src.old/model/pubspec.yaml.g.dart';
+import '../model/pubspec.yaml.g.dart';
 
 /// Token used for authentication
 ///

diff --git a/lib/src.old/client/observer.dart b/lib/src.old/client/observer.dart
@@ -1,9 +1,9 @@
-import 'package:spinify/src.old/client/spinify_interface.dart';
-import 'package:spinify/src.old/client/state.dart';
-import 'package:spinify/src.old/model/event.dart';
-import 'package:spinify/src.old/model/exception.dart';
-import 'package:spinify/src.old/subscription/subscription.dart';
-import 'package:spinify/src.old/subscription/subscription_state.dart';
+import '../model/event.dart';
+import '../model/exception.dart';
+import '../subscription/subscription.dart';
+import '../subscription/subscription_state.dart';
+import 'spinify_interface.dart';
+import 'state.dart';
 
 /// An interface for observing the behavior of Spinify instances.
 /// {@category Client}

diff --git a/lib/src.old/client/spinify.dart b/lib/src.old/client/spinify.dart
@@ -1,37 +1,38 @@
 import 'dart:async';
 
 import 'package:meta/meta.dart';
-import 'package:spinify/src.old/client/config.dart';
-import 'package:spinify/src.old/client/disconnect_code.dart';
-import 'package:spinify/src.old/client/observer.dart';
-import 'package:spinify/src.old/client/spinify_interface.dart';
-import 'package:spinify/src.old/client/state.dart';
-import 'package:spinify/src.old/client/states_stream.dart';
-import 'package:spinify/src.old/model/channel_presence.dart';
-import 'package:spinify/src.old/model/channel_push.dart';
-import 'package:spinify/src.old/model/connect.dart';
-import 'package:spinify/src.old/model/disconnect.dart';
-import 'package:spinify/src.old/model/event.dart';
-import 'package:spinify/src.old/model/exception.dart';
-import 'package:spinify/src.old/model/history.dart';
-import 'package:spinify/src.old/model/message.dart';
-import 'package:spinify/src.old/model/metrics.dart';
-import 'package:spinify/src.old/model/presence.dart';
-import 'package:spinify/src.old/model/presence_stats.dart';
-import 'package:spinify/src.old/model/publication.dart';
-import 'package:spinify/src.old/model/pushes_stream.dart';
-import 'package:spinify/src.old/model/refresh.dart';
-import 'package:spinify/src.old/model/stream_position.dart';
-import 'package:spinify/src.old/model/subscribe.dart';
-import 'package:spinify/src.old/model/unsubscribe.dart';
-import 'package:spinify/src.old/subscription/client_subscription_manager.dart';
-import 'package:spinify/src.old/subscription/server_subscription_manager.dart';
-import 'package:spinify/src.old/subscription/subscription.dart';
-import 'package:spinify/src.old/subscription/subscription_config.dart';
-import 'package:spinify/src.old/transport/transport_interface.dart';
-import 'package:spinify/src.old/transport/ws_protobuf_transport.dart';
-import 'package:spinify/src.old/util/event_queue.dart';
-import 'package:spinify/src.old/util/logger.dart' as logger;
+
+import '../model/channel_presence.dart';
+import '../model/channel_push.dart';
+import '../model/connect.dart';
+import '../model/disconnect.dart';
+import '../model/event.dart';
+import '../model/exception.dart';
+import '../model/history.dart';
+import '../model/message.dart';
+import '../model/metrics.dart';
+import '../model/presence.dart';
+import '../model/presence_stats.dart';
+import '../model/publication.dart';
+import '../model/pushes_stream.dart';
+import '../model/refresh.dart';
+import '../model/stream_position.dart';
+import '../model/subscribe.dart';
+import '../model/unsubscribe.dart';
+import '../subscription/client_subscription_manager.dart';
+import '../subscription/server_subscription_manager.dart';
+import '../subscription/subscription.dart';
+import '../subscription/subscription_config.dart';
+import '../transport/transport_interface.dart';
+import '../transport/ws_protobuf_transport.dart';
+import '../util/event_queue.dart';
+import '../util/logger.dart' as logger;
+import 'config.dart';
+import 'disconnect_code.dart';
+import 'observer.dart';
+import 'spinify_interface.dart';
+import 'state.dart';
+import 'states_stream.dart';
 
 /// {@template spinify}
 /// Spinify client for Centrifuge.

diff --git a/lib/src.old/client/spinify_interface.dart b/lib/src.old/client/spinify_interface.dart
@@ -2,16 +2,16 @@
 
 import 'dart:async';
 
-import 'package:spinify/src.old/client/state.dart';
-import 'package:spinify/src.old/client/states_stream.dart';
-import 'package:spinify/src.old/model/history.dart';
-import 'package:spinify/src.old/model/metrics.dart';
-import 'package:spinify/src.old/model/presence.dart';
-import 'package:spinify/src.old/model/presence_stats.dart';
-import 'package:spinify/src.old/model/pushes_stream.dart';
-import 'package:spinify/src.old/model/stream_position.dart';
-import 'package:spinify/src.old/subscription/subscription.dart';
-import 'package:spinify/src.old/subscription/subscription_config.dart';
+import '../model/history.dart';
+import '../model/metrics.dart';
+import '../model/presence.dart';
+import '../model/presence_stats.dart';
+import '../model/pushes_stream.dart';
+import '../model/stream_position.dart';
+import '../subscription/subscription.dart';
+import '../subscription/subscription_config.dart';
+import 'state.dart';
+import 'states_stream.dart';
 
 /// Spinify client interface.
 abstract interface class ISpinify

diff --git a/lib/src.old/client/states_stream.dart b/lib/src.old/client/states_stream.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:spinify/src.old/client/state.dart';
+import 'state.dart';
 
 /// Stream of Spinify's [SpinifyState] changes.
 /// {@category Client}

diff --git a/lib/src.old/model/channel_presence.dart b/lib/src.old/model/channel_presence.dart
@@ -1,6 +1,6 @@
 import 'package:meta/meta.dart';
-import 'package:spinify/src.old/model/channel_push.dart';
-import 'package:spinify/src.old/model/client_info.dart';
+import 'channel_push.dart';
+import 'client_info.dart';
 
 /// {@template channel_presence}
 /// Channel presence.

diff --git a/lib/src.old/model/channel_push.dart b/lib/src.old/model/channel_push.dart
@@ -1,5 +1,5 @@
 import 'package:meta/meta.dart';
-import 'package:spinify/src.old/model/event.dart';
+import 'event.dart';
 
 /// {@template spinify_channel_push}
 /// Base class for all channel push events.

diff --git a/lib/src.old/model/connect.dart b/lib/src.old/model/connect.dart
@@ -1,4 +1,4 @@
-import 'package:spinify/src.old/model/channel_push.dart';
+import 'channel_push.dart';
 
 /// {@template connect}
 /// Connect push from Centrifugo server.

diff --git a/lib/src.old/model/disconnect.dart b/lib/src.old/model/disconnect.dart
@@ -1,4 +1,4 @@
-import 'package:spinify/src.old/model/channel_push.dart';
+import 'channel_push.dart';
 
 /// {@template disconnect}
 /// Disconnect push from Centrifugo server.

diff --git a/lib/src.old/model/history.dart b/lib/src.old/model/history.dart
@@ -1,6 +1,6 @@
 import 'package:meta/meta.dart';
-import 'package:spinify/src.old/model/publication.dart';
-import 'package:spinify/src.old/model/stream_position.dart';
+import 'publication.dart';
+import 'stream_position.dart';
 
 /// {@template history}
 /// History

diff --git a/lib/src.old/model/message.dart b/lib/src.old/model/message.dart
@@ -1,4 +1,4 @@
-import 'package:spinify/src.old/model/channel_push.dart';
+import 'channel_push.dart';
 
 /// {@template message}
 /// Message push from Centrifugo server.

diff --git a/lib/src.old/model/metrics.dart b/lib/src.old/model/metrics.dart
@@ -1,5 +1,5 @@
 import 'package:meta/meta.dart';
-import 'package:spinify/src.old/client/state.dart';
+import '../client/state.dart';
 
 /// Subscription count
 /// - total

diff --git a/lib/src.old/model/presence.dart b/lib/src.old/model/presence.dart
@@ -1,5 +1,5 @@
 import 'package:meta/meta.dart';
-import 'package:spinify/src.old/model/client_info.dart';
+import 'client_info.dart';
 
 /// {@template presence}
 /// Presence

diff --git a/lib/src.old/model/publication.dart b/lib/src.old/model/publication.dart
@@ -1,7 +1,7 @@
 import 'package:fixnum/fixnum.dart' as fixnum;
 import 'package:meta/meta.dart';
-import 'package:spinify/src.old/model/channel_push.dart';
-import 'package:spinify/src.old/model/client_info.dart';
+import 'channel_push.dart';
+import 'client_info.dart';
 
 /// {@template publication}
 /// Publication context

diff --git a/lib/src.old/model/pushes_stream.dart b/lib/src.old/model/pushes_stream.dart
@@ -1,11 +1,11 @@
 import 'dart:async';
 
 import 'package:meta/meta.dart';
-import 'package:spinify/src.old/model/channel_presence.dart';
-import 'package:spinify/src.old/model/channel_push.dart';
-import 'package:spinify/src.old/model/event.dart';
-import 'package:spinify/src.old/model/message.dart';
-import 'package:spinify/src.old/model/publication.dart';
+import 'channel_presence.dart';
+import 'channel_push.dart';
+import 'event.dart';
+import 'message.dart';
+import 'publication.dart';
 
 /// Stream of received pushes from Centrifugo server for a channel.
 /// {@category Event}

diff --git a/lib/src.old/model/refresh.dart b/lib/src.old/model/refresh.dart
@@ -1,4 +1,4 @@
-import 'package:spinify/src.old/model/channel_push.dart';
+import 'channel_push.dart';
 
 /// {@template refresh}
 /// Refresh push from Centrifugo server.

diff --git a/lib/src.old/model/subscribe.dart b/lib/src.old/model/subscribe.dart
@@ -1,5 +1,5 @@
-import 'package:spinify/src.old/model/channel_push.dart';
-import 'package:spinify/src.old/model/stream_position.dart';
+import 'channel_push.dart';
+import 'stream_position.dart';
 
 /// {@template subscribe}
 /// Subscribe push from Centrifugo server.

diff --git a/lib/src.old/model/unsubscribe.dart b/lib/src.old/model/unsubscribe.dart
@@ -1,4 +1,4 @@
-import 'package:spinify/src.old/model/channel_push.dart';
+import 'channel_push.dart';
 
 /// {@template unsubscribe}
 /// Unsubscribe push from Centrifugo server.

diff --git a/lib/src.old/subscription/client_subscription_impl.dart b/lib/src.old/subscription/client_subscription_impl.dart
@@ -2,31 +2,32 @@ import 'dart:async';
 
 import 'package:fixnum/fixnum.dart' as fixnum;
 import 'package:meta/meta.dart';
-import 'package:spinify/src.old/client/disconnect_code.dart';
-import 'package:spinify/src.old/client/spinify.dart';
-import 'package:spinify/src.old/model/channel_presence.dart';
-import 'package:spinify/src.old/model/channel_push.dart';
-import 'package:spinify/src.old/model/connect.dart';
-import 'package:spinify/src.old/model/disconnect.dart';
-import 'package:spinify/src.old/model/event.dart';
-import 'package:spinify/src.old/model/exception.dart';
-import 'package:spinify/src.old/model/history.dart';
-import 'package:spinify/src.old/model/message.dart';
-import 'package:spinify/src.old/model/presence.dart';
-import 'package:spinify/src.old/model/presence_stats.dart';
-import 'package:spinify/src.old/model/publication.dart';
-import 'package:spinify/src.old/model/pushes_stream.dart';
-import 'package:spinify/src.old/model/refresh.dart';
-import 'package:spinify/src.old/model/stream_position.dart';
-import 'package:spinify/src.old/model/subscribe.dart';
-import 'package:spinify/src.old/model/unsubscribe.dart';
-import 'package:spinify/src.old/subscription/subscription.dart';
-import 'package:spinify/src.old/subscription/subscription_config.dart';
-import 'package:spinify/src.old/subscription/subscription_state.dart';
-import 'package:spinify/src.old/subscription/subscription_states_stream.dart';
-import 'package:spinify/src.old/transport/transport_interface.dart';
-import 'package:spinify/src.old/util/event_queue.dart';
-import 'package:spinify/src.old/util/logger.dart' as logger;
+
+import '../client/disconnect_code.dart';
+import '../client/spinify.dart';
+import '../model/channel_presence.dart';
+import '../model/channel_push.dart';
+import '../model/connect.dart';
+import '../model/disconnect.dart';
+import '../model/event.dart';
+import '../model/exception.dart';
+import '../model/history.dart';
+import '../model/message.dart';
+import '../model/presence.dart';
+import '../model/presence_stats.dart';
+import '../model/publication.dart';
+import '../model/pushes_stream.dart';
+import '../model/refresh.dart';
+import '../model/stream_position.dart';
+import '../model/subscribe.dart';
+import '../model/unsubscribe.dart';
+import '../transport/transport_interface.dart';
+import '../util/event_queue.dart';
+import '../util/logger.dart' as logger;
+import 'subscription.dart';
+import 'subscription_config.dart';
+import 'subscription_state.dart';
+import 'subscription_states_stream.dart';
 
 /// Client-side subscription implementation.
 final class SpinifyClientSubscriptionImpl extends SpinifyClientSubscriptionBase

diff --git a/lib/src.old/subscription/client_subscription_manager.dart b/lib/src.old/subscription/client_subscription_manager.dart
@@ -1,12 +1,12 @@
 import 'dart:collection';
 
-import 'package:spinify/src.old/model/channel_push.dart';
-import 'package:spinify/src.old/model/exception.dart';
-import 'package:spinify/src.old/subscription/client_subscription_impl.dart';
-import 'package:spinify/src.old/subscription/subscription.dart';
-import 'package:spinify/src.old/subscription/subscription_config.dart';
-import 'package:spinify/src.old/subscription/subscription_state.dart';
-import 'package:spinify/src.old/transport/transport_interface.dart';
+import '../model/channel_push.dart';
+import '../model/exception.dart';
+import '../transport/transport_interface.dart';
+import 'client_subscription_impl.dart';
+import 'subscription.dart';
+import 'subscription_config.dart';
+import 'subscription_state.dart';
 
 /// Responsible for managing client-side subscriptions.
 final class ClientSubscriptionManager {

diff --git a/lib/src.old/subscription/server_subscription_impl.dart b/lib/src.old/subscription/server_subscription_impl.dart
@@ -2,29 +2,30 @@ import 'dart:async';
 
 import 'package:fixnum/fixnum.dart' as fixnum;
 import 'package:meta/meta.dart';
-import 'package:spinify/src.old/client/spinify.dart';
-import 'package:spinify/src.old/model/channel_presence.dart';
-import 'package:spinify/src.old/model/channel_push.dart';
-import 'package:spinify/src.old/model/connect.dart';
-import 'package:spinify/src.old/model/disconnect.dart';
-import 'package:spinify/src.old/model/event.dart';
-import 'package:spinify/src.old/model/exception.dart';
-import 'package:spinify/src.old/model/history.dart';
-import 'package:spinify/src.old/model/message.dart';
-import 'package:spinify/src.old/model/presence.dart';
-import 'package:spinify/src.old/model/presence_stats.dart';
-import 'package:spinify/src.old/model/publication.dart';
-import 'package:spinify/src.old/model/pushes_stream.dart';
-import 'package:spinify/src.old/model/refresh.dart';
-import 'package:spinify/src.old/model/stream_position.dart';
-import 'package:spinify/src.old/model/subscribe.dart';
-import 'package:spinify/src.old/model/unsubscribe.dart';
-import 'package:spinify/src.old/subscription/subscription.dart';
-import 'package:spinify/src.old/subscription/subscription_state.dart';
-import 'package:spinify/src.old/subscription/subscription_states_stream.dart';
-import 'package:spinify/src.old/transport/transport_interface.dart';
-import 'package:spinify/src.old/util/event_queue.dart';
-import 'package:spinify/src.old/util/logger.dart' as logger;
+
+import '../client/spinify.dart';
+import '../model/channel_presence.dart';
+import '../model/channel_push.dart';
+import '../model/connect.dart';
+import '../model/disconnect.dart';
+import '../model/event.dart';
+import '../model/exception.dart';
+import '../model/history.dart';
+import '../model/message.dart';
+import '../model/presence.dart';
+import '../model/presence_stats.dart';
+import '../model/publication.dart';
+import '../model/pushes_stream.dart';
+import '../model/refresh.dart';
+import '../model/stream_position.dart';
+import '../model/subscribe.dart';
+import '../model/unsubscribe.dart';
+import '../transport/transport_interface.dart';
+import '../util/event_queue.dart';
+import '../util/logger.dart' as logger;
+import 'subscription.dart';
+import 'subscription_state.dart';
+import 'subscription_states_stream.dart';
 
 /// Server-side subscription implementation.
 final class SpinifyServerSubscriptionImpl extends SpinifyServerSubscriptionBase