This commit is contained in:
Christien Rioux 2024-02-27 20:30:37 -05:00
parent 929cddad88
commit 09cde39f97
3 changed files with 49 additions and 50 deletions

View File

@ -172,7 +172,7 @@ sealed class VeilidUpdate with _$VeilidUpdate {
required TypedKey key, required TypedKey key,
required List<ValueSubkeyRange> subkeys, required List<ValueSubkeyRange> subkeys,
required int count, required int count,
required ValueData valueData, required ValueData value,
}) = VeilidUpdateValueChange; }) = VeilidUpdateValueChange;
factory VeilidUpdate.fromJson(dynamic json) => factory VeilidUpdate.fromJson(dynamic json) =>

View File

@ -1352,7 +1352,7 @@ mixin _$VeilidUpdate {
List<String> deadRoutes, List<String> deadRemoteRoutes) List<String> deadRoutes, List<String> deadRemoteRoutes)
routeChange, routeChange,
required TResult Function(Typed<FixedEncodedString43> key, required TResult Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData) List<ValueSubkeyRange> subkeys, int count, ValueData value)
valueChange, valueChange,
}) => }) =>
throw _privateConstructorUsedError; throw _privateConstructorUsedError;
@ -1377,7 +1377,7 @@ mixin _$VeilidUpdate {
TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)? TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
routeChange, routeChange,
TResult? Function(Typed<FixedEncodedString43> key, TResult? Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData)? List<ValueSubkeyRange> subkeys, int count, ValueData value)?
valueChange, valueChange,
}) => }) =>
throw _privateConstructorUsedError; throw _privateConstructorUsedError;
@ -1402,7 +1402,7 @@ mixin _$VeilidUpdate {
TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)? TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
routeChange, routeChange,
TResult Function(Typed<FixedEncodedString43> key, TResult Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData)? List<ValueSubkeyRange> subkeys, int count, ValueData value)?
valueChange, valueChange,
required TResult orElse(), required TResult orElse(),
}) => }) =>
@ -1579,7 +1579,7 @@ class _$VeilidLog implements VeilidLog {
List<String> deadRoutes, List<String> deadRemoteRoutes) List<String> deadRoutes, List<String> deadRemoteRoutes)
routeChange, routeChange,
required TResult Function(Typed<FixedEncodedString43> key, required TResult Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData) List<ValueSubkeyRange> subkeys, int count, ValueData value)
valueChange, valueChange,
}) { }) {
return log(logLevel, message, backtrace); return log(logLevel, message, backtrace);
@ -1607,7 +1607,7 @@ class _$VeilidLog implements VeilidLog {
TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)? TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
routeChange, routeChange,
TResult? Function(Typed<FixedEncodedString43> key, TResult? Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData)? List<ValueSubkeyRange> subkeys, int count, ValueData value)?
valueChange, valueChange,
}) { }) {
return log?.call(logLevel, message, backtrace); return log?.call(logLevel, message, backtrace);
@ -1635,7 +1635,7 @@ class _$VeilidLog implements VeilidLog {
TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)? TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
routeChange, routeChange,
TResult Function(Typed<FixedEncodedString43> key, TResult Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData)? List<ValueSubkeyRange> subkeys, int count, ValueData value)?
valueChange, valueChange,
required TResult orElse(), required TResult orElse(),
}) { }) {
@ -1825,7 +1825,7 @@ class _$VeilidAppMessage implements VeilidAppMessage {
List<String> deadRoutes, List<String> deadRemoteRoutes) List<String> deadRoutes, List<String> deadRemoteRoutes)
routeChange, routeChange,
required TResult Function(Typed<FixedEncodedString43> key, required TResult Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData) List<ValueSubkeyRange> subkeys, int count, ValueData value)
valueChange, valueChange,
}) { }) {
return appMessage(message, sender); return appMessage(message, sender);
@ -1853,7 +1853,7 @@ class _$VeilidAppMessage implements VeilidAppMessage {
TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)? TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
routeChange, routeChange,
TResult? Function(Typed<FixedEncodedString43> key, TResult? Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData)? List<ValueSubkeyRange> subkeys, int count, ValueData value)?
valueChange, valueChange,
}) { }) {
return appMessage?.call(message, sender); return appMessage?.call(message, sender);
@ -1881,7 +1881,7 @@ class _$VeilidAppMessage implements VeilidAppMessage {
TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)? TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
routeChange, routeChange,
TResult Function(Typed<FixedEncodedString43> key, TResult Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData)? List<ValueSubkeyRange> subkeys, int count, ValueData value)?
valueChange, valueChange,
required TResult orElse(), required TResult orElse(),
}) { }) {
@ -2081,7 +2081,7 @@ class _$VeilidAppCall implements VeilidAppCall {
List<String> deadRoutes, List<String> deadRemoteRoutes) List<String> deadRoutes, List<String> deadRemoteRoutes)
routeChange, routeChange,
required TResult Function(Typed<FixedEncodedString43> key, required TResult Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData) List<ValueSubkeyRange> subkeys, int count, ValueData value)
valueChange, valueChange,
}) { }) {
return appCall(message, callId, sender); return appCall(message, callId, sender);
@ -2109,7 +2109,7 @@ class _$VeilidAppCall implements VeilidAppCall {
TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)? TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
routeChange, routeChange,
TResult? Function(Typed<FixedEncodedString43> key, TResult? Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData)? List<ValueSubkeyRange> subkeys, int count, ValueData value)?
valueChange, valueChange,
}) { }) {
return appCall?.call(message, callId, sender); return appCall?.call(message, callId, sender);
@ -2137,7 +2137,7 @@ class _$VeilidAppCall implements VeilidAppCall {
TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)? TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
routeChange, routeChange,
TResult Function(Typed<FixedEncodedString43> key, TResult Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData)? List<ValueSubkeyRange> subkeys, int count, ValueData value)?
valueChange, valueChange,
required TResult orElse(), required TResult orElse(),
}) { }) {
@ -2341,7 +2341,7 @@ class _$VeilidUpdateAttachment implements VeilidUpdateAttachment {
List<String> deadRoutes, List<String> deadRemoteRoutes) List<String> deadRoutes, List<String> deadRemoteRoutes)
routeChange, routeChange,
required TResult Function(Typed<FixedEncodedString43> key, required TResult Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData) List<ValueSubkeyRange> subkeys, int count, ValueData value)
valueChange, valueChange,
}) { }) {
return attachment(state, publicInternetReady, localNetworkReady); return attachment(state, publicInternetReady, localNetworkReady);
@ -2369,7 +2369,7 @@ class _$VeilidUpdateAttachment implements VeilidUpdateAttachment {
TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)? TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
routeChange, routeChange,
TResult? Function(Typed<FixedEncodedString43> key, TResult? Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData)? List<ValueSubkeyRange> subkeys, int count, ValueData value)?
valueChange, valueChange,
}) { }) {
return attachment?.call(state, publicInternetReady, localNetworkReady); return attachment?.call(state, publicInternetReady, localNetworkReady);
@ -2397,7 +2397,7 @@ class _$VeilidUpdateAttachment implements VeilidUpdateAttachment {
TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)? TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
routeChange, routeChange,
TResult Function(Typed<FixedEncodedString43> key, TResult Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData)? List<ValueSubkeyRange> subkeys, int count, ValueData value)?
valueChange, valueChange,
required TResult orElse(), required TResult orElse(),
}) { }) {
@ -2611,7 +2611,7 @@ class _$VeilidUpdateNetwork implements VeilidUpdateNetwork {
List<String> deadRoutes, List<String> deadRemoteRoutes) List<String> deadRoutes, List<String> deadRemoteRoutes)
routeChange, routeChange,
required TResult Function(Typed<FixedEncodedString43> key, required TResult Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData) List<ValueSubkeyRange> subkeys, int count, ValueData value)
valueChange, valueChange,
}) { }) {
return network(started, bpsDown, bpsUp, peers); return network(started, bpsDown, bpsUp, peers);
@ -2639,7 +2639,7 @@ class _$VeilidUpdateNetwork implements VeilidUpdateNetwork {
TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)? TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
routeChange, routeChange,
TResult? Function(Typed<FixedEncodedString43> key, TResult? Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData)? List<ValueSubkeyRange> subkeys, int count, ValueData value)?
valueChange, valueChange,
}) { }) {
return network?.call(started, bpsDown, bpsUp, peers); return network?.call(started, bpsDown, bpsUp, peers);
@ -2667,7 +2667,7 @@ class _$VeilidUpdateNetwork implements VeilidUpdateNetwork {
TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)? TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
routeChange, routeChange,
TResult Function(Typed<FixedEncodedString43> key, TResult Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData)? List<ValueSubkeyRange> subkeys, int count, ValueData value)?
valueChange, valueChange,
required TResult orElse(), required TResult orElse(),
}) { }) {
@ -2856,7 +2856,7 @@ class _$VeilidUpdateConfig implements VeilidUpdateConfig {
List<String> deadRoutes, List<String> deadRemoteRoutes) List<String> deadRoutes, List<String> deadRemoteRoutes)
routeChange, routeChange,
required TResult Function(Typed<FixedEncodedString43> key, required TResult Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData) List<ValueSubkeyRange> subkeys, int count, ValueData value)
valueChange, valueChange,
}) { }) {
return config(this.config); return config(this.config);
@ -2884,7 +2884,7 @@ class _$VeilidUpdateConfig implements VeilidUpdateConfig {
TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)? TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
routeChange, routeChange,
TResult? Function(Typed<FixedEncodedString43> key, TResult? Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData)? List<ValueSubkeyRange> subkeys, int count, ValueData value)?
valueChange, valueChange,
}) { }) {
return config?.call(this.config); return config?.call(this.config);
@ -2912,7 +2912,7 @@ class _$VeilidUpdateConfig implements VeilidUpdateConfig {
TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)? TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
routeChange, routeChange,
TResult Function(Typed<FixedEncodedString43> key, TResult Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData)? List<ValueSubkeyRange> subkeys, int count, ValueData value)?
valueChange, valueChange,
required TResult orElse(), required TResult orElse(),
}) { }) {
@ -3115,7 +3115,7 @@ class _$VeilidUpdateRouteChange implements VeilidUpdateRouteChange {
List<String> deadRoutes, List<String> deadRemoteRoutes) List<String> deadRoutes, List<String> deadRemoteRoutes)
routeChange, routeChange,
required TResult Function(Typed<FixedEncodedString43> key, required TResult Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData) List<ValueSubkeyRange> subkeys, int count, ValueData value)
valueChange, valueChange,
}) { }) {
return routeChange(deadRoutes, deadRemoteRoutes); return routeChange(deadRoutes, deadRemoteRoutes);
@ -3143,7 +3143,7 @@ class _$VeilidUpdateRouteChange implements VeilidUpdateRouteChange {
TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)? TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
routeChange, routeChange,
TResult? Function(Typed<FixedEncodedString43> key, TResult? Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData)? List<ValueSubkeyRange> subkeys, int count, ValueData value)?
valueChange, valueChange,
}) { }) {
return routeChange?.call(deadRoutes, deadRemoteRoutes); return routeChange?.call(deadRoutes, deadRemoteRoutes);
@ -3171,7 +3171,7 @@ class _$VeilidUpdateRouteChange implements VeilidUpdateRouteChange {
TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)? TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
routeChange, routeChange,
TResult Function(Typed<FixedEncodedString43> key, TResult Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData)? List<ValueSubkeyRange> subkeys, int count, ValueData value)?
valueChange, valueChange,
required TResult orElse(), required TResult orElse(),
}) { }) {
@ -3264,9 +3264,9 @@ abstract class _$$VeilidUpdateValueChangeCopyWith<$Res> {
{Typed<FixedEncodedString43> key, {Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, List<ValueSubkeyRange> subkeys,
int count, int count,
ValueData valueData}); ValueData value});
$ValueDataCopyWith<$Res> get valueData; $ValueDataCopyWith<$Res> get value;
} }
/// @nodoc /// @nodoc
@ -3283,7 +3283,7 @@ class __$$VeilidUpdateValueChangeCopyWithImpl<$Res>
Object? key = null, Object? key = null,
Object? subkeys = null, Object? subkeys = null,
Object? count = null, Object? count = null,
Object? valueData = null, Object? value = null,
}) { }) {
return _then(_$VeilidUpdateValueChange( return _then(_$VeilidUpdateValueChange(
key: null == key key: null == key
@ -3298,18 +3298,18 @@ class __$$VeilidUpdateValueChangeCopyWithImpl<$Res>
? _value.count ? _value.count
: count // ignore: cast_nullable_to_non_nullable : count // ignore: cast_nullable_to_non_nullable
as int, as int,
valueData: null == valueData value: null == value
? _value.valueData ? _value.value
: valueData // ignore: cast_nullable_to_non_nullable : value // ignore: cast_nullable_to_non_nullable
as ValueData, as ValueData,
)); ));
} }
@override @override
@pragma('vm:prefer-inline') @pragma('vm:prefer-inline')
$ValueDataCopyWith<$Res> get valueData { $ValueDataCopyWith<$Res> get value {
return $ValueDataCopyWith<$Res>(_value.valueData, (value) { return $ValueDataCopyWith<$Res>(_value.value, (value) {
return _then(_value.copyWith(valueData: value)); return _then(_value.copyWith(value: value));
}); });
} }
} }
@ -3321,7 +3321,7 @@ class _$VeilidUpdateValueChange implements VeilidUpdateValueChange {
{required this.key, {required this.key,
required final List<ValueSubkeyRange> subkeys, required final List<ValueSubkeyRange> subkeys,
required this.count, required this.count,
required this.valueData, required this.value,
final String? $type}) final String? $type})
: _subkeys = subkeys, : _subkeys = subkeys,
$type = $type ?? 'ValueChange'; $type = $type ?? 'ValueChange';
@ -3342,14 +3342,14 @@ class _$VeilidUpdateValueChange implements VeilidUpdateValueChange {
@override @override
final int count; final int count;
@override @override
final ValueData valueData; final ValueData value;
@JsonKey(name: 'kind') @JsonKey(name: 'kind')
final String $type; final String $type;
@override @override
String toString() { String toString() {
return 'VeilidUpdate.valueChange(key: $key, subkeys: $subkeys, count: $count, valueData: $valueData)'; return 'VeilidUpdate.valueChange(key: $key, subkeys: $subkeys, count: $count, value: $value)';
} }
@override @override
@ -3360,14 +3360,13 @@ class _$VeilidUpdateValueChange implements VeilidUpdateValueChange {
(identical(other.key, key) || other.key == key) && (identical(other.key, key) || other.key == key) &&
const DeepCollectionEquality().equals(other._subkeys, _subkeys) && const DeepCollectionEquality().equals(other._subkeys, _subkeys) &&
(identical(other.count, count) || other.count == count) && (identical(other.count, count) || other.count == count) &&
(identical(other.valueData, valueData) || (identical(other.value, value) || other.value == value));
other.valueData == valueData));
} }
@JsonKey(ignore: true) @JsonKey(ignore: true)
@override @override
int get hashCode => Object.hash(runtimeType, key, int get hashCode => Object.hash(runtimeType, key,
const DeepCollectionEquality().hash(_subkeys), count, valueData); const DeepCollectionEquality().hash(_subkeys), count, value);
@JsonKey(ignore: true) @JsonKey(ignore: true)
@override @override
@ -3399,10 +3398,10 @@ class _$VeilidUpdateValueChange implements VeilidUpdateValueChange {
List<String> deadRoutes, List<String> deadRemoteRoutes) List<String> deadRoutes, List<String> deadRemoteRoutes)
routeChange, routeChange,
required TResult Function(Typed<FixedEncodedString43> key, required TResult Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData) List<ValueSubkeyRange> subkeys, int count, ValueData value)
valueChange, valueChange,
}) { }) {
return valueChange(key, subkeys, count, valueData); return valueChange(key, subkeys, count, value);
} }
@override @override
@ -3427,10 +3426,10 @@ class _$VeilidUpdateValueChange implements VeilidUpdateValueChange {
TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)? TResult? Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
routeChange, routeChange,
TResult? Function(Typed<FixedEncodedString43> key, TResult? Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData)? List<ValueSubkeyRange> subkeys, int count, ValueData value)?
valueChange, valueChange,
}) { }) {
return valueChange?.call(key, subkeys, count, valueData); return valueChange?.call(key, subkeys, count, value);
} }
@override @override
@ -3455,12 +3454,12 @@ class _$VeilidUpdateValueChange implements VeilidUpdateValueChange {
TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)? TResult Function(List<String> deadRoutes, List<String> deadRemoteRoutes)?
routeChange, routeChange,
TResult Function(Typed<FixedEncodedString43> key, TResult Function(Typed<FixedEncodedString43> key,
List<ValueSubkeyRange> subkeys, int count, ValueData valueData)? List<ValueSubkeyRange> subkeys, int count, ValueData value)?
valueChange, valueChange,
required TResult orElse(), required TResult orElse(),
}) { }) {
if (valueChange != null) { if (valueChange != null) {
return valueChange(key, subkeys, count, valueData); return valueChange(key, subkeys, count, value);
} }
return orElse(); return orElse();
} }
@ -3527,7 +3526,7 @@ abstract class VeilidUpdateValueChange implements VeilidUpdate {
{required final Typed<FixedEncodedString43> key, {required final Typed<FixedEncodedString43> key,
required final List<ValueSubkeyRange> subkeys, required final List<ValueSubkeyRange> subkeys,
required final int count, required final int count,
required final ValueData valueData}) = _$VeilidUpdateValueChange; required final ValueData value}) = _$VeilidUpdateValueChange;
factory VeilidUpdateValueChange.fromJson(Map<String, dynamic> json) = factory VeilidUpdateValueChange.fromJson(Map<String, dynamic> json) =
_$VeilidUpdateValueChange.fromJson; _$VeilidUpdateValueChange.fromJson;
@ -3535,7 +3534,7 @@ abstract class VeilidUpdateValueChange implements VeilidUpdate {
Typed<FixedEncodedString43> get key; Typed<FixedEncodedString43> get key;
List<ValueSubkeyRange> get subkeys; List<ValueSubkeyRange> get subkeys;
int get count; int get count;
ValueData get valueData; ValueData get value;
@JsonKey(ignore: true) @JsonKey(ignore: true)
_$$VeilidUpdateValueChangeCopyWith<_$VeilidUpdateValueChange> get copyWith => _$$VeilidUpdateValueChangeCopyWith<_$VeilidUpdateValueChange> get copyWith =>
throw _privateConstructorUsedError; throw _privateConstructorUsedError;

View File

@ -241,7 +241,7 @@ _$VeilidUpdateValueChange _$$VeilidUpdateValueChangeFromJson(
.map(ValueSubkeyRange.fromJson) .map(ValueSubkeyRange.fromJson)
.toList(), .toList(),
count: json['count'] as int, count: json['count'] as int,
valueData: ValueData.fromJson(json['value_data']), value: ValueData.fromJson(json['value']),
$type: json['kind'] as String?, $type: json['kind'] as String?,
); );
@ -251,7 +251,7 @@ Map<String, dynamic> _$$VeilidUpdateValueChangeToJson(
'key': instance.key.toJson(), 'key': instance.key.toJson(),
'subkeys': instance.subkeys.map((e) => e.toJson()).toList(), 'subkeys': instance.subkeys.map((e) => e.toJson()).toList(),
'count': instance.count, 'count': instance.count,
'value_data': instance.valueData.toJson(), 'value': instance.value.toJson(),
'kind': instance.$type, 'kind': instance.$type,
}; };