diff --git a/packages/dynamite/dynamite/lib/src/builder/built_object_serializer.dart b/packages/dynamite/dynamite/lib/src/builder/built_object_serializer.dart index e3de0870bb9..35e5c8f00ef 100644 --- a/packages/dynamite/dynamite/lib/src/builder/built_object_serializer.dart +++ b/packages/dynamite/dynamite/lib/src/builder/built_object_serializer.dart @@ -145,7 +145,10 @@ Iterable deserializeProperty( final result = resolveType( spec, state, - '${identifier}_${toDartName(propertyName, uppercaseFirstCharacter: true)}', + toDartName( + propertyName, + identifier: identifier, + ), propertySchema, nullable: isDartParameterNullable(schema.required.contains(propertyName), propertySchema), ); @@ -174,7 +177,10 @@ Iterable serializePropertyNullable( final result = resolveType( spec, state, - '${identifier}_${toDartName(propertyName, uppercaseFirstCharacter: true)}', + toDartName( + propertyName, + identifier: identifier, + ), propertySchema, nullable: isDartParameterNullable(schema.required.contains(propertyName), propertySchema), ); @@ -206,7 +212,10 @@ Iterable serializeProperty( final result = resolveType( spec, state, - '${identifier}_${toDartName(propertyName, uppercaseFirstCharacter: true)}', + toDartName( + propertyName, + identifier: identifier, + ), propertySchema, nullable: isDartParameterNullable(schema.required.contains(propertyName), propertySchema), ); diff --git a/packages/dynamite/dynamite/lib/src/builder/client.dart b/packages/dynamite/dynamite/lib/src/builder/client.dart index f76db7a7c3b..cea02fc6acf 100644 --- a/packages/dynamite/dynamite/lib/src/builder/client.dart +++ b/packages/dynamite/dynamite/lib/src/builder/client.dart @@ -288,7 +288,7 @@ Iterable buildTags( state, toDartName( '$operationName-${parameter.name}', - uppercaseFirstCharacter: true, + className: true, ), parameter.schema!, nullable: !parameterRequired, @@ -319,10 +319,10 @@ Iterable buildTags( if (response.headers != null) { final identifierBuilder = StringBuffer(); if (tag != null) { - identifierBuilder.write(toDartName(tag, uppercaseFirstCharacter: true)); + identifierBuilder.write(toDartName(tag, className: true)); } identifierBuilder - ..write(toDartName(operationName, uppercaseFirstCharacter: true)) + ..write(toDartName(operationName, className: true)) ..write('Headers'); headersType = resolveObject( spec, @@ -356,7 +356,7 @@ Iterable buildTags( response, spec, state, - toDartName(identifierBuilder.toString(), uppercaseFirstCharacter: true), + toDartName(identifierBuilder.toString(), className: true), ); if (!hasUriParameters) { @@ -581,7 +581,7 @@ final authentication = $client.authentications?.firstWhereOrNull( final securityScheme = spec.components!.securitySchemes![requirement.keys.single]!; final dynamiteAuth = toDartName( 'Dynamite-${securityScheme.fullName.join('-')}-Authentication', - uppercaseFirstCharacter: true, + className: true, ); return refer(dynamiteAuth, 'package:dynamite_runtime/http_client.dart') .newInstance(const []) diff --git a/packages/dynamite/dynamite/lib/src/builder/generate_schemas.dart b/packages/dynamite/dynamite/lib/src/builder/generate_schemas.dart index 06f277c93e6..89c6bed3f6f 100644 --- a/packages/dynamite/dynamite/lib/src/builder/generate_schemas.dart +++ b/packages/dynamite/dynamite/lib/src/builder/generate_schemas.dart @@ -11,7 +11,7 @@ Iterable generateSchemas( ) sync* { if (spec.components?.schemas != null) { for (final schema in spec.components!.schemas!.entries) { - final identifier = toDartName(schema.key, uppercaseFirstCharacter: true); + final identifier = toDartName(schema.key, className: true); final result = resolveType( spec, state, diff --git a/packages/dynamite/dynamite/lib/src/builder/resolve_mime_type.dart b/packages/dynamite/dynamite/lib/src/builder/resolve_mime_type.dart index 2c5bd1425d3..87564fb29f2 100644 --- a/packages/dynamite/dynamite/lib/src/builder/resolve_mime_type.dart +++ b/packages/dynamite/dynamite/lib/src/builder/resolve_mime_type.dart @@ -25,7 +25,7 @@ TypeResult? resolveMimeTypeDecode( final result = resolveType( spec, state, - toDartName('$identifier-$mimeType', uppercaseFirstCharacter: true), + toDartName('$identifier-$mimeType', className: true), mediaType.schema!, ); @@ -67,7 +67,7 @@ Iterable resolveMimeTypeEncode( final result = resolveType( spec, state, - toDartName('$identifier-request-$mimeType', uppercaseFirstCharacter: true), + toDartName('$identifier-request-$mimeType', className: true), mediaType.schema!, nullable: dartParameterNullable, ); diff --git a/packages/dynamite/dynamite/lib/src/builder/resolve_object.dart b/packages/dynamite/dynamite/lib/src/builder/resolve_object.dart index 41de75bc20c..4cd70d374dd 100644 --- a/packages/dynamite/dynamite/lib/src/builder/resolve_object.dart +++ b/packages/dynamite/dynamite/lib/src/builder/resolve_object.dart @@ -43,7 +43,10 @@ TypeResultObject resolveObject( var result = resolveType( spec, state, - '${identifier}_${toDartName(propertyName, uppercaseFirstCharacter: true)}', + toDartName( + propertyName, + identifier: identifier, + ), propertySchema, nullable: isDartParameterNullable( schema.required.contains(propertyName), diff --git a/packages/dynamite/dynamite/lib/src/builder/resolve_ofs.dart b/packages/dynamite/dynamite/lib/src/builder/resolve_ofs.dart index d5f42b25e80..4a6428f450d 100644 --- a/packages/dynamite/dynamite/lib/src/builder/resolve_ofs.dart +++ b/packages/dynamite/dynamite/lib/src/builder/resolve_ofs.dart @@ -88,7 +88,10 @@ TypeResult resolveAllOf( final result = resolveType( spec, state, - '${identifier}_${toDartName(propertyName, uppercaseFirstCharacter: true)}', + toDartName( + propertyName, + identifier: identifier, + ), propertySchema, nullable: isDartParameterNullable( s.required.contains(propertyName), diff --git a/packages/dynamite/dynamite/lib/src/builder/resolve_type.dart b/packages/dynamite/dynamite/lib/src/builder/resolve_type.dart index 08b66c8078d..3818bd0a285 100644 --- a/packages/dynamite/dynamite/lib/src/builder/resolve_type.dart +++ b/packages/dynamite/dynamite/lib/src/builder/resolve_type.dart @@ -26,7 +26,7 @@ TypeResult resolveType( final subResult = resolveType( spec, state, - toDartName(name, uppercaseFirstCharacter: true), + toDartName(name, className: true), spec.components!.schemas![name]!, nullable: nullable, ); diff --git a/packages/dynamite/dynamite/lib/src/helpers/dart_helpers.dart b/packages/dynamite/dynamite/lib/src/helpers/dart_helpers.dart index 95f5fae5a60..a5b9b27f03c 100644 --- a/packages/dynamite/dynamite/lib/src/helpers/dart_helpers.dart +++ b/packages/dynamite/dynamite/lib/src/helpers/dart_helpers.dart @@ -1,10 +1,59 @@ +/// Converts the provided [name] into a `lowerCamelCase` alphanumerical +/// representation. +/// +/// If the resulting name is reserved by dart or only contains numbers it is +/// prefixed with a `$`. +/// Specify [className] to return a `UpperCamelCase` name. +/// +/// The optional [identifier] will be prefixed and separated by an `_` if +/// provided. The reserved name check will be made against the resulting +/// string. The identifier itself is not checked to be a valid dart name, nor +/// will `className` have any affect. +/// +/// ```dart +/// print(toDartName( +/// 'test-variable-name', +/// )); // testVariableName +/// +/// print(toDartName( +/// 'test-variable-name', +/// className: true, +/// )); // TestVariableName +/// +/// print(toDartName( +/// '10', +/// )); // $10 +/// +/// print(toDartName( +/// 'String', +/// )); // string +/// +/// print(toDartName( +/// 'String', +/// className: true, +/// )); // $String +/// +/// print(toDartName( +/// 'string', +/// identifier: 'Identifier' +/// )); // Identifier_String +/// +/// print(toDartName( +/// 'string', +/// identifier: 'Identifier' +/// className: false, +/// )); // Identifier_String +/// ``` String toDartName( String name, { - bool uppercaseFirstCharacter = false, + String? identifier, + bool className = false, }) { + final capitalize = identifier != null || className; + var result = ''; - var upperCase = uppercaseFirstCharacter; - var firstCharacter = !uppercaseFirstCharacter; + var upperCase = capitalize; + var firstCharacter = !capitalize; for (final char in name.split('')) { if (_isNonAlphaNumericString(char)) { upperCase = true; @@ -15,6 +64,10 @@ String toDartName( } } + if (identifier != null) { + return '${identifier}_$result'; + } + if (_reservedNames.contains(result) || RegExp(r'^[0-9]+$', multiLine: true).hasMatch(result)) { return '\$$result'; } diff --git a/packages/dynamite/dynamite/lib/src/helpers/dynamite.dart b/packages/dynamite/dynamite/lib/src/helpers/dynamite.dart index 148c58dfbe7..15ff62569be 100644 --- a/packages/dynamite/dynamite/lib/src/helpers/dynamite.dart +++ b/packages/dynamite/dynamite/lib/src/helpers/dynamite.dart @@ -15,7 +15,7 @@ String filterMethodName(String operationId, String tag) { return output.join('-'); } -String clientName(String tag) => '\$${toDartName(tag, uppercaseFirstCharacter: true)}Client'; +String clientName(String tag) => '\$${toDartName(tag, className: true)}Client'; bool isDartParameterNullable( bool required, diff --git a/packages/dynamite/dynamite/test/dart_helpers_test.dart b/packages/dynamite/dynamite/test/dart_helpers_test.dart index 5d5f69130a3..8b9bd51d9a5 100644 --- a/packages/dynamite/dynamite/test/dart_helpers_test.dart +++ b/packages/dynamite/dynamite/test/dart_helpers_test.dart @@ -20,7 +20,7 @@ void main() { for (final value in values) { expect(toDartName(value.$1), value.$2); - expect(toDartName(value.$1, uppercaseFirstCharacter: true), value.$3); + expect(toDartName(value.$1, className: true), value.$3); } }); diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/enum.openapi.dart b/packages/dynamite/dynamite_end_to_end_test/lib/enum.openapi.dart index b6f9f18aa79..9a637553ad0 100644 --- a/packages/dynamite/dynamite_end_to_end_test/lib/enum.openapi.dart +++ b/packages/dynamite/dynamite_end_to_end_test/lib/enum.openapi.dart @@ -216,59 +216,59 @@ class _$EnumDynamicSerializer implements PrimitiveSerializer { _fromWire[serialized]!; } -class WrappedEnum_$String extends EnumClass { - const WrappedEnum_$String._(super.name); +class WrappedEnum_String extends EnumClass { + const WrappedEnum_String._(super.name); /// `test` - static const WrappedEnum_$String test = _$wrappedEnum$StringTest; + static const WrappedEnum_String test = _$wrappedEnumStringTest; /// `default` @BuiltValueEnumConst(wireName: 'default') - static const WrappedEnum_$String $default = _$wrappedEnum$String$default; + static const WrappedEnum_String $default = _$wrappedEnumString$default; /// Returns a set with all values this enum contains. - static BuiltSet get values => _$wrappedEnum$StringValues; + static BuiltSet get values => _$wrappedEnumStringValues; /// Returns the enum value associated to the [name]. - static WrappedEnum_$String valueOf(String name) => _$valueOfWrappedEnum_$String(name); + static WrappedEnum_String valueOf(String name) => _$valueOfWrappedEnum_String(name); /// Returns the serialized value of this enum value. String get value => _$jsonSerializers.serializeWith(serializer, this)! as String; - /// Serializer for WrappedEnum_$String. + /// Serializer for WrappedEnum_String. @BuiltValueSerializer(custom: true) - static Serializer get serializer => const _$WrappedEnum_$StringSerializer(); + static Serializer get serializer => const _$WrappedEnum_StringSerializer(); } -class _$WrappedEnum_$StringSerializer implements PrimitiveSerializer { - const _$WrappedEnum_$StringSerializer(); +class _$WrappedEnum_StringSerializer implements PrimitiveSerializer { + const _$WrappedEnum_StringSerializer(); - static const Map _toWire = { - WrappedEnum_$String.test: 'test', - WrappedEnum_$String.$default: 'default', + static const Map _toWire = { + WrappedEnum_String.test: 'test', + WrappedEnum_String.$default: 'default', }; - static const Map _fromWire = { - 'test': WrappedEnum_$String.test, - 'default': WrappedEnum_$String.$default, + static const Map _fromWire = { + 'test': WrappedEnum_String.test, + 'default': WrappedEnum_String.$default, }; @override - Iterable get types => const [WrappedEnum_$String]; + Iterable get types => const [WrappedEnum_String]; @override - String get wireName => r'WrappedEnum_$String'; + String get wireName => 'WrappedEnum_String'; @override Object serialize( Serializers serializers, - WrappedEnum_$String object, { + WrappedEnum_String object, { FullType specifiedType = FullType.unspecified, }) => _toWire[object]!; @override - WrappedEnum_$String deserialize( + WrappedEnum_String deserialize( Serializers serializers, Object serialized, { FullType specifiedType = FullType.unspecified, @@ -346,7 +346,7 @@ class _$WrappedEnum_IntegerSerializer implements PrimitiveSerializer _$enumDynamicValues = BuiltSet(const _$wrappedEnum$StringValues = - BuiltSet(const [ - _$wrappedEnum$StringTest, - _$wrappedEnum$String$default, +final BuiltSet _$wrappedEnumStringValues = BuiltSet(const [ + _$wrappedEnumStringTest, + _$wrappedEnumString$default, ]); const WrappedEnum_Integer _$wrappedEnumInteger$0 = WrappedEnum_Integer._('\$0'); @@ -133,7 +132,7 @@ class _$WrappedEnumSerializer implements StructuredSerializer { {FullType specifiedType = FullType.unspecified}) { final result = [ 'String', - serializers.serialize(object.string, specifiedType: const FullType(WrappedEnum_$String)), + serializers.serialize(object.string, specifiedType: const FullType(WrappedEnum_String)), 'integer', serializers.serialize(object.integer, specifiedType: const FullType(WrappedEnum_Integer)), ]; @@ -153,8 +152,8 @@ class _$WrappedEnumSerializer implements StructuredSerializer { final Object? value = iterator.current; switch (key) { case 'String': - result.string = serializers.deserialize(value, specifiedType: const FullType(WrappedEnum_$String))! - as WrappedEnum_$String; + result.string = + serializers.deserialize(value, specifiedType: const FullType(WrappedEnum_String))! as WrappedEnum_String; break; case 'integer': result.integer = serializers.deserialize(value, specifiedType: const FullType(WrappedEnum_Integer))! @@ -208,8 +207,8 @@ class _$EnumReferenceSerializer implements StructuredSerializer { abstract mixin class $WrappedEnumInterfaceBuilder { void replace($WrappedEnumInterface other); void update(void Function($WrappedEnumInterfaceBuilder) updates); - WrappedEnum_$String? get string; - set string(WrappedEnum_$String? string); + WrappedEnum_String? get string; + set string(WrappedEnum_String? string); WrappedEnum_Integer? get integer; set integer(WrappedEnum_Integer? integer); @@ -217,7 +216,7 @@ abstract mixin class $WrappedEnumInterfaceBuilder { class _$WrappedEnum extends WrappedEnum { @override - final WrappedEnum_$String string; + final WrappedEnum_String string; @override final WrappedEnum_Integer integer; @@ -262,9 +261,9 @@ class _$WrappedEnum extends WrappedEnum { class WrappedEnumBuilder implements Builder, $WrappedEnumInterfaceBuilder { _$WrappedEnum? _$v; - WrappedEnum_$String? _string; - WrappedEnum_$String? get string => _$this._string; - set string(covariant WrappedEnum_$String? string) => _$this._string = string; + WrappedEnum_String? _string; + WrappedEnum_String? get string => _$this._string; + set string(covariant WrappedEnum_String? string) => _$this._string = string; WrappedEnum_Integer? _integer; WrappedEnum_Integer? get integer => _$this._integer; diff --git a/packages/dynamite/dynamite_end_to_end_test/test/enum_test.dart b/packages/dynamite/dynamite_end_to_end_test/test/enum_test.dart index 44b59e61f90..aed7cf0fb69 100644 --- a/packages/dynamite/dynamite_end_to_end_test/test/enum_test.dart +++ b/packages/dynamite/dynamite_end_to_end_test/test/enum_test.dart @@ -100,7 +100,7 @@ void main() { test('serialize', () { final object = WrappedEnum( (b) => b - ..string = WrappedEnum_$String.$default + ..string = WrappedEnum_String.$default ..integer = WrappedEnum_Integer.$2, ); diff --git a/packages/nextcloud/generate_exports.dart b/packages/nextcloud/generate_exports.dart index b1bf059ed4a..33b59976219 100644 --- a/packages/nextcloud/generate_exports.dart +++ b/packages/nextcloud/generate_exports.dart @@ -17,7 +17,7 @@ void main() { final basename = p.basename(file.path); final id = basename.substring(0, basename.length - 13); final variablePrefix = toDartName(id); - final classPrefix = toDartName(id, uppercaseFirstCharacter: true); + final classPrefix = toDartName(id, className: true); idStatements ..writeln(' /// ID for the $id app.') diff --git a/packages/nextcloud/lib/src/api/spreed.openapi.dart b/packages/nextcloud/lib/src/api/spreed.openapi.dart index e404fe83066..9abebd17384 100644 --- a/packages/nextcloud/lib/src/api/spreed.openapi.dart +++ b/packages/nextcloud/lib/src/api/spreed.openapi.dart @@ -37232,28 +37232,28 @@ class _$SignalingGetSettingsApiVersionSerializer implements PrimitiveSerializer< } @BuiltValue(instantiable: false) -abstract interface class $SignalingSettings_HelloAuthParams_$10Interface { +abstract interface class $SignalingSettings_HelloAuthParams_10Interface { String? get userid; String get ticket; } -abstract class SignalingSettings_HelloAuthParams_$10 +abstract class SignalingSettings_HelloAuthParams_10 implements - $SignalingSettings_HelloAuthParams_$10Interface, - Built { - /// Creates a new SignalingSettings_HelloAuthParams_$10 object using the builder pattern. - factory SignalingSettings_HelloAuthParams_$10([void Function(SignalingSettings_HelloAuthParams_$10Builder)? b]) = - _$SignalingSettings_HelloAuthParams_$10; + $SignalingSettings_HelloAuthParams_10Interface, + Built { + /// Creates a new SignalingSettings_HelloAuthParams_10 object using the builder pattern. + factory SignalingSettings_HelloAuthParams_10([void Function(SignalingSettings_HelloAuthParams_10Builder)? b]) = + _$SignalingSettings_HelloAuthParams_10; // coverage:ignore-start - const SignalingSettings_HelloAuthParams_$10._(); + const SignalingSettings_HelloAuthParams_10._(); // coverage:ignore-end /// Creates a new object from the given [json] data. /// /// Use [toJson] to serialize it back into json. // coverage:ignore-start - factory SignalingSettings_HelloAuthParams_$10.fromJson(Map json) => + factory SignalingSettings_HelloAuthParams_10.fromJson(Map json) => _$jsonSerializers.deserializeWith(serializer, json)!; // coverage:ignore-end @@ -37264,33 +37264,33 @@ abstract class SignalingSettings_HelloAuthParams_$10 Map toJson() => _$jsonSerializers.serializeWith(serializer, this)! as Map; // coverage:ignore-end - /// Serializer for SignalingSettings_HelloAuthParams_$10. - static Serializer get serializer => - _$signalingSettingsHelloAuthParams$10Serializer; + /// Serializer for SignalingSettings_HelloAuthParams_10. + static Serializer get serializer => + _$signalingSettingsHelloAuthParams10Serializer; } @BuiltValue(instantiable: false) -abstract interface class $SignalingSettings_HelloAuthParams_$20Interface { +abstract interface class $SignalingSettings_HelloAuthParams_20Interface { String get token; } -abstract class SignalingSettings_HelloAuthParams_$20 +abstract class SignalingSettings_HelloAuthParams_20 implements - $SignalingSettings_HelloAuthParams_$20Interface, - Built { - /// Creates a new SignalingSettings_HelloAuthParams_$20 object using the builder pattern. - factory SignalingSettings_HelloAuthParams_$20([void Function(SignalingSettings_HelloAuthParams_$20Builder)? b]) = - _$SignalingSettings_HelloAuthParams_$20; + $SignalingSettings_HelloAuthParams_20Interface, + Built { + /// Creates a new SignalingSettings_HelloAuthParams_20 object using the builder pattern. + factory SignalingSettings_HelloAuthParams_20([void Function(SignalingSettings_HelloAuthParams_20Builder)? b]) = + _$SignalingSettings_HelloAuthParams_20; // coverage:ignore-start - const SignalingSettings_HelloAuthParams_$20._(); + const SignalingSettings_HelloAuthParams_20._(); // coverage:ignore-end /// Creates a new object from the given [json] data. /// /// Use [toJson] to serialize it back into json. // coverage:ignore-start - factory SignalingSettings_HelloAuthParams_$20.fromJson(Map json) => + factory SignalingSettings_HelloAuthParams_20.fromJson(Map json) => _$jsonSerializers.deserializeWith(serializer, json)!; // coverage:ignore-end @@ -37301,17 +37301,17 @@ abstract class SignalingSettings_HelloAuthParams_$20 Map toJson() => _$jsonSerializers.serializeWith(serializer, this)! as Map; // coverage:ignore-end - /// Serializer for SignalingSettings_HelloAuthParams_$20. - static Serializer get serializer => - _$signalingSettingsHelloAuthParams$20Serializer; + /// Serializer for SignalingSettings_HelloAuthParams_20. + static Serializer get serializer => + _$signalingSettingsHelloAuthParams20Serializer; } @BuiltValue(instantiable: false) abstract interface class $SignalingSettings_HelloAuthParamsInterface { @BuiltValueField(wireName: '1.0') - SignalingSettings_HelloAuthParams_$10 get $10; + SignalingSettings_HelloAuthParams_10 get $10; @BuiltValueField(wireName: '2.0') - SignalingSettings_HelloAuthParams_$20 get $20; + SignalingSettings_HelloAuthParams_20 get $20; } abstract class SignalingSettings_HelloAuthParams @@ -40439,15 +40439,15 @@ final Serializers _$serializers = (Serializers().toBuilder() ) ..add(SignalingSettings_HelloAuthParams.serializer) ..addBuilderFactory( - const FullType(SignalingSettings_HelloAuthParams_$10), - SignalingSettings_HelloAuthParams_$10Builder.new, + const FullType(SignalingSettings_HelloAuthParams_10), + SignalingSettings_HelloAuthParams_10Builder.new, ) - ..add(SignalingSettings_HelloAuthParams_$10.serializer) + ..add(SignalingSettings_HelloAuthParams_10.serializer) ..addBuilderFactory( - const FullType(SignalingSettings_HelloAuthParams_$20), - SignalingSettings_HelloAuthParams_$20Builder.new, + const FullType(SignalingSettings_HelloAuthParams_20), + SignalingSettings_HelloAuthParams_20Builder.new, ) - ..add(SignalingSettings_HelloAuthParams_$20.serializer) + ..add(SignalingSettings_HelloAuthParams_20.serializer) ..addBuilderFactory(const FullType(SignalingSettings_Stunservers), SignalingSettings_StunserversBuilder.new) ..add(SignalingSettings_Stunservers.serializer) ..addBuilderFactory( diff --git a/packages/nextcloud/lib/src/api/spreed.openapi.g.dart b/packages/nextcloud/lib/src/api/spreed.openapi.g.dart index d452e5c153e..7c79d84f6e0 100644 --- a/packages/nextcloud/lib/src/api/spreed.openapi.g.dart +++ b/packages/nextcloud/lib/src/api/spreed.openapi.g.dart @@ -7744,10 +7744,10 @@ Serializer _$SettingsSetsipSettingsResponseApplicationJson_OcsSerializer(); Serializer _$settingsSetsipSettingsResponseApplicationJsonSerializer = _$SettingsSetsipSettingsResponseApplicationJsonSerializer(); -Serializer _$signalingSettingsHelloAuthParams$10Serializer = - _$SignalingSettings_HelloAuthParams_$10Serializer(); -Serializer _$signalingSettingsHelloAuthParams$20Serializer = - _$SignalingSettings_HelloAuthParams_$20Serializer(); +Serializer _$signalingSettingsHelloAuthParams10Serializer = + _$SignalingSettings_HelloAuthParams_10Serializer(); +Serializer _$signalingSettingsHelloAuthParams20Serializer = + _$SignalingSettings_HelloAuthParams_20Serializer(); Serializer _$signalingSettingsHelloAuthParamsSerializer = _$SignalingSettings_HelloAuthParamsSerializer(); Serializer _$signalingSettingsStunserversSerializer = @@ -19828,15 +19828,15 @@ class _$SettingsSetsipSettingsResponseApplicationJsonSerializer } } -class _$SignalingSettings_HelloAuthParams_$10Serializer - implements StructuredSerializer { +class _$SignalingSettings_HelloAuthParams_10Serializer + implements StructuredSerializer { @override - final Iterable types = const [SignalingSettings_HelloAuthParams_$10, _$SignalingSettings_HelloAuthParams_$10]; + final Iterable types = const [SignalingSettings_HelloAuthParams_10, _$SignalingSettings_HelloAuthParams_10]; @override - final String wireName = 'SignalingSettings_HelloAuthParams_\$10'; + final String wireName = 'SignalingSettings_HelloAuthParams_10'; @override - Iterable serialize(Serializers serializers, SignalingSettings_HelloAuthParams_$10 object, + Iterable serialize(Serializers serializers, SignalingSettings_HelloAuthParams_10 object, {FullType specifiedType = FullType.unspecified}) { final result = [ 'ticket', @@ -19853,9 +19853,9 @@ class _$SignalingSettings_HelloAuthParams_$10Serializer } @override - SignalingSettings_HelloAuthParams_$10 deserialize(Serializers serializers, Iterable serialized, + SignalingSettings_HelloAuthParams_10 deserialize(Serializers serializers, Iterable serialized, {FullType specifiedType = FullType.unspecified}) { - final result = SignalingSettings_HelloAuthParams_$10Builder(); + final result = SignalingSettings_HelloAuthParams_10Builder(); final iterator = serialized.iterator; while (iterator.moveNext()) { @@ -19876,15 +19876,15 @@ class _$SignalingSettings_HelloAuthParams_$10Serializer } } -class _$SignalingSettings_HelloAuthParams_$20Serializer - implements StructuredSerializer { +class _$SignalingSettings_HelloAuthParams_20Serializer + implements StructuredSerializer { @override - final Iterable types = const [SignalingSettings_HelloAuthParams_$20, _$SignalingSettings_HelloAuthParams_$20]; + final Iterable types = const [SignalingSettings_HelloAuthParams_20, _$SignalingSettings_HelloAuthParams_20]; @override - final String wireName = 'SignalingSettings_HelloAuthParams_\$20'; + final String wireName = 'SignalingSettings_HelloAuthParams_20'; @override - Iterable serialize(Serializers serializers, SignalingSettings_HelloAuthParams_$20 object, + Iterable serialize(Serializers serializers, SignalingSettings_HelloAuthParams_20 object, {FullType specifiedType = FullType.unspecified}) { final result = [ 'token', @@ -19895,9 +19895,9 @@ class _$SignalingSettings_HelloAuthParams_$20Serializer } @override - SignalingSettings_HelloAuthParams_$20 deserialize(Serializers serializers, Iterable serialized, + SignalingSettings_HelloAuthParams_20 deserialize(Serializers serializers, Iterable serialized, {FullType specifiedType = FullType.unspecified}) { - final result = SignalingSettings_HelloAuthParams_$20Builder(); + final result = SignalingSettings_HelloAuthParams_20Builder(); final iterator = serialized.iterator; while (iterator.moveNext()) { @@ -19926,9 +19926,9 @@ class _$SignalingSettings_HelloAuthParamsSerializer implements StructuredSeriali {FullType specifiedType = FullType.unspecified}) { final result = [ '1.0', - serializers.serialize(object.$10, specifiedType: const FullType(SignalingSettings_HelloAuthParams_$10)), + serializers.serialize(object.$10, specifiedType: const FullType(SignalingSettings_HelloAuthParams_10)), '2.0', - serializers.serialize(object.$20, specifiedType: const FullType(SignalingSettings_HelloAuthParams_$20)), + serializers.serialize(object.$20, specifiedType: const FullType(SignalingSettings_HelloAuthParams_20)), ]; return result; @@ -19947,13 +19947,13 @@ class _$SignalingSettings_HelloAuthParamsSerializer implements StructuredSeriali switch (key) { case '1.0': result.$10.replace( - serializers.deserialize(value, specifiedType: const FullType(SignalingSettings_HelloAuthParams_$10))! - as SignalingSettings_HelloAuthParams_$10); + serializers.deserialize(value, specifiedType: const FullType(SignalingSettings_HelloAuthParams_10))! + as SignalingSettings_HelloAuthParams_10); break; case '2.0': result.$20.replace( - serializers.deserialize(value, specifiedType: const FullType(SignalingSettings_HelloAuthParams_$20))! - as SignalingSettings_HelloAuthParams_$20); + serializers.deserialize(value, specifiedType: const FullType(SignalingSettings_HelloAuthParams_20))! + as SignalingSettings_HelloAuthParams_20); break; } } @@ -50917,9 +50917,9 @@ class SettingsSetsipSettingsResponseApplicationJsonBuilder } } -abstract mixin class $SignalingSettings_HelloAuthParams_$10InterfaceBuilder { - void replace($SignalingSettings_HelloAuthParams_$10Interface other); - void update(void Function($SignalingSettings_HelloAuthParams_$10InterfaceBuilder) updates); +abstract mixin class $SignalingSettings_HelloAuthParams_10InterfaceBuilder { + void replace($SignalingSettings_HelloAuthParams_10Interface other); + void update(void Function($SignalingSettings_HelloAuthParams_10InterfaceBuilder) updates); String? get userid; set userid(String? userid); @@ -50927,32 +50927,32 @@ abstract mixin class $SignalingSettings_HelloAuthParams_$10InterfaceBuilder { set ticket(String? ticket); } -class _$SignalingSettings_HelloAuthParams_$10 extends SignalingSettings_HelloAuthParams_$10 { +class _$SignalingSettings_HelloAuthParams_10 extends SignalingSettings_HelloAuthParams_10 { @override final String? userid; @override final String ticket; - factory _$SignalingSettings_HelloAuthParams_$10( - [void Function(SignalingSettings_HelloAuthParams_$10Builder)? updates]) => - (SignalingSettings_HelloAuthParams_$10Builder()..update(updates))._build(); + factory _$SignalingSettings_HelloAuthParams_10( + [void Function(SignalingSettings_HelloAuthParams_10Builder)? updates]) => + (SignalingSettings_HelloAuthParams_10Builder()..update(updates))._build(); - _$SignalingSettings_HelloAuthParams_$10._({this.userid, required this.ticket}) : super._() { - BuiltValueNullFieldError.checkNotNull(ticket, r'SignalingSettings_HelloAuthParams_$10', 'ticket'); + _$SignalingSettings_HelloAuthParams_10._({this.userid, required this.ticket}) : super._() { + BuiltValueNullFieldError.checkNotNull(ticket, r'SignalingSettings_HelloAuthParams_10', 'ticket'); } @override - SignalingSettings_HelloAuthParams_$10 rebuild(void Function(SignalingSettings_HelloAuthParams_$10Builder) updates) => + SignalingSettings_HelloAuthParams_10 rebuild(void Function(SignalingSettings_HelloAuthParams_10Builder) updates) => (toBuilder()..update(updates)).build(); @override - SignalingSettings_HelloAuthParams_$10Builder toBuilder() => - SignalingSettings_HelloAuthParams_$10Builder()..replace(this); + SignalingSettings_HelloAuthParams_10Builder toBuilder() => + SignalingSettings_HelloAuthParams_10Builder()..replace(this); @override bool operator ==(Object other) { if (identical(other, this)) return true; - return other is SignalingSettings_HelloAuthParams_$10 && userid == other.userid && ticket == other.ticket; + return other is SignalingSettings_HelloAuthParams_10 && userid == other.userid && ticket == other.ticket; } @override @@ -50966,18 +50966,18 @@ class _$SignalingSettings_HelloAuthParams_$10 extends SignalingSettings_HelloAut @override String toString() { - return (newBuiltValueToStringHelper(r'SignalingSettings_HelloAuthParams_$10') + return (newBuiltValueToStringHelper(r'SignalingSettings_HelloAuthParams_10') ..add('userid', userid) ..add('ticket', ticket)) .toString(); } } -class SignalingSettings_HelloAuthParams_$10Builder +class SignalingSettings_HelloAuthParams_10Builder implements - Builder, - $SignalingSettings_HelloAuthParams_$10InterfaceBuilder { - _$SignalingSettings_HelloAuthParams_$10? _$v; + Builder, + $SignalingSettings_HelloAuthParams_10InterfaceBuilder { + _$SignalingSettings_HelloAuthParams_10? _$v; String? _userid; String? get userid => _$this._userid; @@ -50987,9 +50987,9 @@ class SignalingSettings_HelloAuthParams_$10Builder String? get ticket => _$this._ticket; set ticket(covariant String? ticket) => _$this._ticket = ticket; - SignalingSettings_HelloAuthParams_$10Builder(); + SignalingSettings_HelloAuthParams_10Builder(); - SignalingSettings_HelloAuthParams_$10Builder get _$this { + SignalingSettings_HelloAuthParams_10Builder get _$this { final $v = _$v; if ($v != null) { _userid = $v.userid; @@ -51000,60 +51000,60 @@ class SignalingSettings_HelloAuthParams_$10Builder } @override - void replace(covariant SignalingSettings_HelloAuthParams_$10 other) { + void replace(covariant SignalingSettings_HelloAuthParams_10 other) { ArgumentError.checkNotNull(other, 'other'); - _$v = other as _$SignalingSettings_HelloAuthParams_$10; + _$v = other as _$SignalingSettings_HelloAuthParams_10; } @override - void update(void Function(SignalingSettings_HelloAuthParams_$10Builder)? updates) { + void update(void Function(SignalingSettings_HelloAuthParams_10Builder)? updates) { if (updates != null) updates(this); } @override - SignalingSettings_HelloAuthParams_$10 build() => _build(); + SignalingSettings_HelloAuthParams_10 build() => _build(); - _$SignalingSettings_HelloAuthParams_$10 _build() { + _$SignalingSettings_HelloAuthParams_10 _build() { final _$result = _$v ?? - _$SignalingSettings_HelloAuthParams_$10._( + _$SignalingSettings_HelloAuthParams_10._( userid: userid, - ticket: BuiltValueNullFieldError.checkNotNull(ticket, r'SignalingSettings_HelloAuthParams_$10', 'ticket')); + ticket: BuiltValueNullFieldError.checkNotNull(ticket, r'SignalingSettings_HelloAuthParams_10', 'ticket')); replace(_$result); return _$result; } } -abstract mixin class $SignalingSettings_HelloAuthParams_$20InterfaceBuilder { - void replace($SignalingSettings_HelloAuthParams_$20Interface other); - void update(void Function($SignalingSettings_HelloAuthParams_$20InterfaceBuilder) updates); +abstract mixin class $SignalingSettings_HelloAuthParams_20InterfaceBuilder { + void replace($SignalingSettings_HelloAuthParams_20Interface other); + void update(void Function($SignalingSettings_HelloAuthParams_20InterfaceBuilder) updates); String? get token; set token(String? token); } -class _$SignalingSettings_HelloAuthParams_$20 extends SignalingSettings_HelloAuthParams_$20 { +class _$SignalingSettings_HelloAuthParams_20 extends SignalingSettings_HelloAuthParams_20 { @override final String token; - factory _$SignalingSettings_HelloAuthParams_$20( - [void Function(SignalingSettings_HelloAuthParams_$20Builder)? updates]) => - (SignalingSettings_HelloAuthParams_$20Builder()..update(updates))._build(); + factory _$SignalingSettings_HelloAuthParams_20( + [void Function(SignalingSettings_HelloAuthParams_20Builder)? updates]) => + (SignalingSettings_HelloAuthParams_20Builder()..update(updates))._build(); - _$SignalingSettings_HelloAuthParams_$20._({required this.token}) : super._() { - BuiltValueNullFieldError.checkNotNull(token, r'SignalingSettings_HelloAuthParams_$20', 'token'); + _$SignalingSettings_HelloAuthParams_20._({required this.token}) : super._() { + BuiltValueNullFieldError.checkNotNull(token, r'SignalingSettings_HelloAuthParams_20', 'token'); } @override - SignalingSettings_HelloAuthParams_$20 rebuild(void Function(SignalingSettings_HelloAuthParams_$20Builder) updates) => + SignalingSettings_HelloAuthParams_20 rebuild(void Function(SignalingSettings_HelloAuthParams_20Builder) updates) => (toBuilder()..update(updates)).build(); @override - SignalingSettings_HelloAuthParams_$20Builder toBuilder() => - SignalingSettings_HelloAuthParams_$20Builder()..replace(this); + SignalingSettings_HelloAuthParams_20Builder toBuilder() => + SignalingSettings_HelloAuthParams_20Builder()..replace(this); @override bool operator ==(Object other) { if (identical(other, this)) return true; - return other is SignalingSettings_HelloAuthParams_$20 && token == other.token; + return other is SignalingSettings_HelloAuthParams_20 && token == other.token; } @override @@ -51066,23 +51066,23 @@ class _$SignalingSettings_HelloAuthParams_$20 extends SignalingSettings_HelloAut @override String toString() { - return (newBuiltValueToStringHelper(r'SignalingSettings_HelloAuthParams_$20')..add('token', token)).toString(); + return (newBuiltValueToStringHelper(r'SignalingSettings_HelloAuthParams_20')..add('token', token)).toString(); } } -class SignalingSettings_HelloAuthParams_$20Builder +class SignalingSettings_HelloAuthParams_20Builder implements - Builder, - $SignalingSettings_HelloAuthParams_$20InterfaceBuilder { - _$SignalingSettings_HelloAuthParams_$20? _$v; + Builder, + $SignalingSettings_HelloAuthParams_20InterfaceBuilder { + _$SignalingSettings_HelloAuthParams_20? _$v; String? _token; String? get token => _$this._token; set token(covariant String? token) => _$this._token = token; - SignalingSettings_HelloAuthParams_$20Builder(); + SignalingSettings_HelloAuthParams_20Builder(); - SignalingSettings_HelloAuthParams_$20Builder get _$this { + SignalingSettings_HelloAuthParams_20Builder get _$this { final $v = _$v; if ($v != null) { _token = $v.token; @@ -51092,23 +51092,23 @@ class SignalingSettings_HelloAuthParams_$20Builder } @override - void replace(covariant SignalingSettings_HelloAuthParams_$20 other) { + void replace(covariant SignalingSettings_HelloAuthParams_20 other) { ArgumentError.checkNotNull(other, 'other'); - _$v = other as _$SignalingSettings_HelloAuthParams_$20; + _$v = other as _$SignalingSettings_HelloAuthParams_20; } @override - void update(void Function(SignalingSettings_HelloAuthParams_$20Builder)? updates) { + void update(void Function(SignalingSettings_HelloAuthParams_20Builder)? updates) { if (updates != null) updates(this); } @override - SignalingSettings_HelloAuthParams_$20 build() => _build(); + SignalingSettings_HelloAuthParams_20 build() => _build(); - _$SignalingSettings_HelloAuthParams_$20 _build() { + _$SignalingSettings_HelloAuthParams_20 _build() { final _$result = _$v ?? - _$SignalingSettings_HelloAuthParams_$20._( - token: BuiltValueNullFieldError.checkNotNull(token, r'SignalingSettings_HelloAuthParams_$20', 'token')); + _$SignalingSettings_HelloAuthParams_20._( + token: BuiltValueNullFieldError.checkNotNull(token, r'SignalingSettings_HelloAuthParams_20', 'token')); replace(_$result); return _$result; } @@ -51117,18 +51117,18 @@ class SignalingSettings_HelloAuthParams_$20Builder abstract mixin class $SignalingSettings_HelloAuthParamsInterfaceBuilder { void replace($SignalingSettings_HelloAuthParamsInterface other); void update(void Function($SignalingSettings_HelloAuthParamsInterfaceBuilder) updates); - SignalingSettings_HelloAuthParams_$10Builder get $10; - set $10(SignalingSettings_HelloAuthParams_$10Builder? $10); + SignalingSettings_HelloAuthParams_10Builder get $10; + set $10(SignalingSettings_HelloAuthParams_10Builder? $10); - SignalingSettings_HelloAuthParams_$20Builder get $20; - set $20(SignalingSettings_HelloAuthParams_$20Builder? $20); + SignalingSettings_HelloAuthParams_20Builder get $20; + set $20(SignalingSettings_HelloAuthParams_20Builder? $20); } class _$SignalingSettings_HelloAuthParams extends SignalingSettings_HelloAuthParams { @override - final SignalingSettings_HelloAuthParams_$10 $10; + final SignalingSettings_HelloAuthParams_10 $10; @override - final SignalingSettings_HelloAuthParams_$20 $20; + final SignalingSettings_HelloAuthParams_20 $20; factory _$SignalingSettings_HelloAuthParams([void Function(SignalingSettings_HelloAuthParamsBuilder)? updates]) => (SignalingSettings_HelloAuthParamsBuilder()..update(updates))._build(); @@ -51175,15 +51175,13 @@ class SignalingSettings_HelloAuthParamsBuilder $SignalingSettings_HelloAuthParamsInterfaceBuilder { _$SignalingSettings_HelloAuthParams? _$v; - SignalingSettings_HelloAuthParams_$10Builder? _$10; - SignalingSettings_HelloAuthParams_$10Builder get $10 => - _$this._$10 ??= SignalingSettings_HelloAuthParams_$10Builder(); - set $10(covariant SignalingSettings_HelloAuthParams_$10Builder? $10) => _$this._$10 = $10; + SignalingSettings_HelloAuthParams_10Builder? _$10; + SignalingSettings_HelloAuthParams_10Builder get $10 => _$this._$10 ??= SignalingSettings_HelloAuthParams_10Builder(); + set $10(covariant SignalingSettings_HelloAuthParams_10Builder? $10) => _$this._$10 = $10; - SignalingSettings_HelloAuthParams_$20Builder? _$20; - SignalingSettings_HelloAuthParams_$20Builder get $20 => - _$this._$20 ??= SignalingSettings_HelloAuthParams_$20Builder(); - set $20(covariant SignalingSettings_HelloAuthParams_$20Builder? $20) => _$this._$20 = $20; + SignalingSettings_HelloAuthParams_20Builder? _$20; + SignalingSettings_HelloAuthParams_20Builder get $20 => _$this._$20 ??= SignalingSettings_HelloAuthParams_20Builder(); + set $20(covariant SignalingSettings_HelloAuthParams_20Builder? $20) => _$this._$20 = $20; SignalingSettings_HelloAuthParamsBuilder();