feat(all): Remove freezed

Fixes #43.
2023-06-19 23:11:58 +02:00 · 2023-06-19 23:11:58 +02:00 · 30dca67fb6
commit 30dca67fb6
parent 2db44e2f51
9 changed files with 45 additions and 265 deletions
--- a/packages/moxxmpp/lib/src/xeps/xep_0060/xep_0060.dart
+++ b/packages/moxxmpp/lib/src/xeps/xep_0060/xep_0060.dart
@ -1,4 +1,3 @@
-import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:meta/meta.dart';
 import 'package:moxlib/moxlib.dart';
 import 'package:moxxmpp/src/events.dart';
--- a/packages/moxxmpp/lib/src/xeps/xep_0198/negotiator.dart
+++ b/packages/moxxmpp/lib/src/xeps/xep_0198/negotiator.dart
@ -113,7 +113,7 @@ class StreamManagementNegotiator extends Sasl2FeatureNegotiator
    // We have to do this because we otherwise get a stanza stuck in the queue,
    // thus spamming the server on every <a /> nonza we receive.
    // ignore: cascade_invocations
-    await sm.setState(StreamManagementState(0, 0));
+    await sm.setState(const StreamManagementState(0, 0));
    await sm.commitState();

    _resumeFailed = true;
--- a/packages/moxxmpp/lib/src/xeps/xep_0198/state.dart
+++ b/packages/moxxmpp/lib/src/xeps/xep_0198/state.dart
@ -1,18 +1,43 @@
-import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:meta/meta.dart';

-part 'state.freezed.dart';
-part 'state.g.dart';
+const _smNotSpecified = Object();

-@freezed
-class StreamManagementState with _$StreamManagementState {
-  factory StreamManagementState(
-    int c2s,
-    int s2c, {
-    String? streamResumptionLocation,
-    String? streamResumptionId,
-  }) = _StreamManagementState;
+@immutable
+class StreamManagementState {
+  const StreamManagementState(
+    this.c2s,
+    this.s2c, {
+    this.streamResumptionLocation,
+    this.streamResumptionId,
+  });

-  // JSON
-  factory StreamManagementState.fromJson(Map<String, dynamic> json) =>
-      _$StreamManagementStateFromJson(json);
+  /// The counter of stanzas sent from the client to the server.
+  final int c2s;
+
+  /// The counter of stanzas sent from the server to the client.
+  final int s2c;
+
+  /// If set, the server's preferred location for resumption.
+  final String? streamResumptionLocation;
+
+  /// If set, the token to allow using stream resumption.
+  final String? streamResumptionId;
+
+  StreamManagementState copyWith({
+    Object c2s = _smNotSpecified,
+    Object s2c = _smNotSpecified,
+    Object? streamResumptionLocation = _smNotSpecified,
+    Object? streamResumptionId = _smNotSpecified,
+  }) {
+    return StreamManagementState(
+      c2s != _smNotSpecified ? c2s as int : this.c2s,
+      s2c != _smNotSpecified ? s2c as int : this.s2c,
+      streamResumptionLocation: streamResumptionLocation != _smNotSpecified
+          ? streamResumptionLocation as String?
+          : this.streamResumptionLocation,
+      streamResumptionId: streamResumptionId != _smNotSpecified
+          ? streamResumptionId as String?
+          : this.streamResumptionId,
+    );
+  }
 }
--- a/packages/moxxmpp/lib/src/xeps/xep_0198/state.freezed.dart
+++ b/packages/moxxmpp/lib/src/xeps/xep_0198/state.freezed.dart
@ -1,217 +0,0 @@
-// coverage:ignore-file
-// GENERATED CODE - DO NOT MODIFY BY HAND
-// ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
-
-part of 'state.dart';
-
-// **************************************************************************
-// FreezedGenerator
-// **************************************************************************
-
-T _$identity<T>(T value) => value;
-
-final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
-
-StreamManagementState _$StreamManagementStateFromJson(
-    Map<String, dynamic> json) {
-  return _StreamManagementState.fromJson(json);
-}
-
-/// @nodoc
-mixin _$StreamManagementState {
-  int get c2s => throw _privateConstructorUsedError;
-  int get s2c => throw _privateConstructorUsedError;
-  String? get streamResumptionLocation => throw _privateConstructorUsedError;
-  String? get streamResumptionId => throw _privateConstructorUsedError;
-
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
-  $StreamManagementStateCopyWith<StreamManagementState> get copyWith =>
-      throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $StreamManagementStateCopyWith<$Res> {
-  factory $StreamManagementStateCopyWith(StreamManagementState value,
-          $Res Function(StreamManagementState) then) =
-      _$StreamManagementStateCopyWithImpl<$Res, StreamManagementState>;
-  @useResult
-  $Res call(
-      {int c2s,
-      int s2c,
-      String? streamResumptionLocation,
-      String? streamResumptionId});
-}
-
-/// @nodoc
-class _$StreamManagementStateCopyWithImpl<$Res,
-        $Val extends StreamManagementState>
-    implements $StreamManagementStateCopyWith<$Res> {
-  _$StreamManagementStateCopyWithImpl(this._value, this._then);
-
-  // ignore: unused_field
-  final $Val _value;
-  // ignore: unused_field
-  final $Res Function($Val) _then;
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? c2s = null,
-    Object? s2c = null,
-    Object? streamResumptionLocation = freezed,
-    Object? streamResumptionId = freezed,
-  }) {
-    return _then(_value.copyWith(
-      c2s: null == c2s
-          ? _value.c2s
-          : c2s // ignore: cast_nullable_to_non_nullable
-              as int,
-      s2c: null == s2c
-          ? _value.s2c
-          : s2c // ignore: cast_nullable_to_non_nullable
-              as int,
-      streamResumptionLocation: freezed == streamResumptionLocation
-          ? _value.streamResumptionLocation
-          : streamResumptionLocation // ignore: cast_nullable_to_non_nullable
-              as String?,
-      streamResumptionId: freezed == streamResumptionId
-          ? _value.streamResumptionId
-          : streamResumptionId // ignore: cast_nullable_to_non_nullable
-              as String?,
-    ) as $Val);
-  }
-}
-
-/// @nodoc
-abstract class _$$_StreamManagementStateCopyWith<$Res>
-    implements $StreamManagementStateCopyWith<$Res> {
-  factory _$$_StreamManagementStateCopyWith(_$_StreamManagementState value,
-          $Res Function(_$_StreamManagementState) then) =
-      __$$_StreamManagementStateCopyWithImpl<$Res>;
-  @override
-  @useResult
-  $Res call(
-      {int c2s,
-      int s2c,
-      String? streamResumptionLocation,
-      String? streamResumptionId});
-}
-
-/// @nodoc
-class __$$_StreamManagementStateCopyWithImpl<$Res>
-    extends _$StreamManagementStateCopyWithImpl<$Res, _$_StreamManagementState>
-    implements _$$_StreamManagementStateCopyWith<$Res> {
-  __$$_StreamManagementStateCopyWithImpl(_$_StreamManagementState _value,
-      $Res Function(_$_StreamManagementState) _then)
-      : super(_value, _then);
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? c2s = null,
-    Object? s2c = null,
-    Object? streamResumptionLocation = freezed,
-    Object? streamResumptionId = freezed,
-  }) {
-    return _then(_$_StreamManagementState(
-      null == c2s
-          ? _value.c2s
-          : c2s // ignore: cast_nullable_to_non_nullable
-              as int,
-      null == s2c
-          ? _value.s2c
-          : s2c // ignore: cast_nullable_to_non_nullable
-              as int,
-      streamResumptionLocation: freezed == streamResumptionLocation
-          ? _value.streamResumptionLocation
-          : streamResumptionLocation // ignore: cast_nullable_to_non_nullable
-              as String?,
-      streamResumptionId: freezed == streamResumptionId
-          ? _value.streamResumptionId
-          : streamResumptionId // ignore: cast_nullable_to_non_nullable
-              as String?,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _$_StreamManagementState implements _StreamManagementState {
-  _$_StreamManagementState(this.c2s, this.s2c,
-      {this.streamResumptionLocation, this.streamResumptionId});
-
-  factory _$_StreamManagementState.fromJson(Map<String, dynamic> json) =>
-      _$$_StreamManagementStateFromJson(json);
-
-  @override
-  final int c2s;
-  @override
-  final int s2c;
-  @override
-  final String? streamResumptionLocation;
-  @override
-  final String? streamResumptionId;
-
-  @override
-  String toString() {
-    return 'StreamManagementState(c2s: $c2s, s2c: $s2c, streamResumptionLocation: $streamResumptionLocation, streamResumptionId: $streamResumptionId)';
-  }
-
-  @override
-  bool operator ==(dynamic other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$_StreamManagementState &&
-            (identical(other.c2s, c2s) || other.c2s == c2s) &&
-            (identical(other.s2c, s2c) || other.s2c == s2c) &&
-            (identical(
-                    other.streamResumptionLocation, streamResumptionLocation) ||
-                other.streamResumptionLocation == streamResumptionLocation) &&
-            (identical(other.streamResumptionId, streamResumptionId) ||
-                other.streamResumptionId == streamResumptionId));
-  }
-
-  @JsonKey(ignore: true)
-  @override
-  int get hashCode => Object.hash(
-      runtimeType, c2s, s2c, streamResumptionLocation, streamResumptionId);
-
-  @JsonKey(ignore: true)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$_StreamManagementStateCopyWith<_$_StreamManagementState> get copyWith =>
-      __$$_StreamManagementStateCopyWithImpl<_$_StreamManagementState>(
-          this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$_StreamManagementStateToJson(
-      this,
-    );
-  }
-}
-
-abstract class _StreamManagementState implements StreamManagementState {
-  factory _StreamManagementState(final int c2s, final int s2c,
-      {final String? streamResumptionLocation,
-      final String? streamResumptionId}) = _$_StreamManagementState;
-
-  factory _StreamManagementState.fromJson(Map<String, dynamic> json) =
-      _$_StreamManagementState.fromJson;
-
-  @override
-  int get c2s;
-  @override
-  int get s2c;
-  @override
-  String? get streamResumptionLocation;
-  @override
-  String? get streamResumptionId;
-  @override
-  @JsonKey(ignore: true)
-  _$$_StreamManagementStateCopyWith<_$_StreamManagementState> get copyWith =>
-      throw _privateConstructorUsedError;
-}
--- a/packages/moxxmpp/lib/src/xeps/xep_0198/state.g.dart
+++ b/packages/moxxmpp/lib/src/xeps/xep_0198/state.g.dart
@ -1,25 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'state.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-_$_StreamManagementState _$$_StreamManagementStateFromJson(
-        Map<String, dynamic> json) =>
-    _$_StreamManagementState(
-      json['c2s'] as int,
-      json['s2c'] as int,
-      streamResumptionLocation: json['streamResumptionLocation'] as String?,
-      streamResumptionId: json['streamResumptionId'] as String?,
-    );
-
-Map<String, dynamic> _$$_StreamManagementStateToJson(
-        _$_StreamManagementState instance) =>
-    <String, dynamic>{
-      'c2s': instance.c2s,
-      's2c': instance.s2c,
-      'streamResumptionLocation': instance.streamResumptionLocation,
-      'streamResumptionId': instance.streamResumptionId,
-    };
--- a/packages/moxxmpp/lib/src/xeps/xep_0198/xep_0198.dart
+++ b/packages/moxxmpp/lib/src/xeps/xep_0198/xep_0198.dart
@ -32,7 +32,7 @@ class StreamManagementManager extends XmppManagerBase {
  final Map<int, SMQueueEntry> _unackedStanzas = {};

  /// Commitable state of the StreamManagementManager
-  StreamManagementState _state = StreamManagementState(0, 0);
+  StreamManagementState _state = const StreamManagementState(0, 0);

  /// Mutex lock for _state
  final Lock _stateLock = Lock();
--- a/packages/moxxmpp/lib/src/xeps/xep_0461.dart
+++ b/packages/moxxmpp/lib/src/xeps/xep_0461.dart
@ -1,4 +1,4 @@
-import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:meta/meta.dart';
 import 'package:moxxmpp/src/jid.dart';
 import 'package:moxxmpp/src/managers/base.dart';
 import 'package:moxxmpp/src/managers/data.dart';
--- a/packages/moxxmpp/pubspec.yaml
+++ b/packages/moxxmpp/pubspec.yaml
@ -10,8 +10,6 @@ environment:
 dependencies:
  collection: ^1.16.0
  cryptography: ^2.0.5
-  freezed: ^2.1.0+1
-  freezed_annotation: ^2.1.0
  hex: ^0.2.0
  json_serializable: ^6.3.1
  logging: ^1.0.2
--- a/packages/moxxmpp/test/xeps/xep_0198_test.dart
+++ b/packages/moxxmpp/test/xeps/xep_0198_test.dart
@ -507,7 +507,7 @@ void main() {
        StreamManagementNegotiator()..resource = 'test-resource',
      ]);
      await conn.getManagerById<StreamManagementManager>(smManager)!.setState(
-            StreamManagementState(
+            const StreamManagementState(
              10,
              10,
              streamResumptionId: 'id-1',
@ -606,7 +606,7 @@ void main() {
        StreamManagementNegotiator()..resource = 'abc123',
      ]);
      await conn.getManagerById<StreamManagementManager>(smManager)!.setState(
-            StreamManagementState(
+            const StreamManagementState(
              10,
              10,
              streamResumptionId: 'id-1',
@ -751,7 +751,7 @@ void main() {
      StreamManagementNegotiator()..resource = 'abc123',
    ]);
    await conn.getManagerById<StreamManagementManager>(smManager)!.setState(
-          StreamManagementState(
+          const StreamManagementState(
            10,
            10,
            streamResumptionId: 'id-1',