From 0e00db794bafa230a5952e50fb180b27f0d4b115 Mon Sep 17 00:00:00 2001 From: Roman Laptev Date: Wed, 26 Nov 2025 18:13:54 +0300 Subject: [PATCH] Update protobuf to 6.0.0 and update protobuf example --- example_protobuf/README.md | 15 -- example_protobuf/lib/example.dart | 6 +- example_protobuf/lib/proto/params.pb.dart | 78 ++++----- example_protobuf/lib/proto/params.pbenum.dart | 15 +- example_protobuf/lib/proto/params.pbjson.dart | 16 +- .../lib/proto/params.pbserver.dart | 13 -- example_protobuf/lib/proto/result.pb.dart | 73 ++++---- example_protobuf/lib/proto/result.pbenum.dart | 15 +- example_protobuf/lib/proto/result.pbjson.dart | 16 +- .../lib/proto/result.pbserver.dart | 13 -- example_protobuf/proto/params.proto | 2 +- example_protobuf/proto/result.proto | 2 +- example_protobuf/pubspec.yaml | 20 +-- generator/lib/src/generator.dart | 8 +- generator/pubspec.yaml | 8 +- generator/test/format_output_test.dart | 20 +-- generator/test/src/generator_test_src.dart | 2 +- generator/test/src/query.pb.dart | 163 ------------------ generator/test/src/result.pb.dart | 130 ++++++++++++++ generator/test/src/result.pbjson.dart | 40 +++++ 20 files changed, 300 insertions(+), 355 deletions(-) delete mode 100644 example_protobuf/lib/proto/params.pbserver.dart delete mode 100644 example_protobuf/lib/proto/result.pbserver.dart delete mode 100644 generator/test/src/query.pb.dart create mode 100644 generator/test/src/result.pb.dart create mode 100644 generator/test/src/result.pbjson.dart diff --git a/example_protobuf/README.md b/example_protobuf/README.md index f766e5874..3ff874479 100644 --- a/example_protobuf/README.md +++ b/example_protobuf/README.md @@ -1,16 +1 @@ # example_protobuf - -A new Flutter project. - -## Getting Started - -This project is a starting point for a Flutter application. - -A few resources to get you started if this is your first Flutter project: - -- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) -- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook) - -For help getting started with Flutter development, view the -[online documentation](https://docs.flutter.dev/), which offers tutorials, -samples, guidance on mobile development, and a full API reference. diff --git a/example_protobuf/lib/example.dart b/example_protobuf/lib/example.dart index 25cda3e50..ec0796970 100644 --- a/example_protobuf/lib/example.dart +++ b/example_protobuf/lib/example.dart @@ -1,8 +1,8 @@ import 'package:dio/dio.dart'; -import 'package:flutter/foundation.dart'; +import 'package:flutter/foundation.dart' show compute; import 'package:retrofit/retrofit.dart'; -import 'package:retrofit_example/proto/params.pbserver.dart'; -import 'package:retrofit_example/proto/result.pbserver.dart'; +import 'package:retrofit_example/proto/params.pb.dart'; +import 'package:retrofit_example/proto/result.pb.dart'; part 'example.g.dart'; diff --git a/example_protobuf/lib/proto/params.pb.dart b/example_protobuf/lib/proto/params.pb.dart index c07363624..0099165cd 100644 --- a/example_protobuf/lib/proto/params.pb.dart +++ b/example_protobuf/lib/proto/params.pb.dart @@ -1,73 +1,64 @@ +// This is a generated file - do not edit. // -// Generated code. Do not modify. -// source: proto/params.proto -// -// @dart = 2.12 +// Generated from proto/params.proto. + +// @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names, prefer_relative_imports import 'dart:core' as $core; import 'package:protobuf/protobuf.dart' as $pb; +export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions; + class Params extends $pb.GeneratedMessage { factory Params({ $core.String? key, }) { - final $result = create(); - if (key != null) { - $result.key = key; - } - return $result; + final result = create(); + if (key != null) result.key = key; + return result; } - Params._() : super(); + Params._(); - factory Params.fromBuffer( - $core.List<$core.int> i, [ - $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY, - ]) => - create()..mergeFromBuffer(i, r); + factory Params.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); - factory Params.fromJson( - $core.String i, [ - $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY, - ]) => - create()..mergeFromJson(i, r); + factory Params.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'Params', - package: const $pb.PackageName( - _omitMessageNames ? '' : 'examples.enumerations', - ), - createEmptyInstance: create, - ) + _omitMessageNames ? '' : 'Params', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'examples.enumerations'), + createEmptyInstance: create) ..aOS(1, _omitFieldNames ? '' : 'key') ..hasRequiredFields = false; - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') - Params clone() => Params()..mergeFromMessage(this); + @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.') + Params clone() => deepCopy(); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') + @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.') Params copyWith(void Function(Params) updates) => super.copyWith((message) => updates(message as Params)) as Params; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static Params create() => Params._(); + @$core.override Params createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); - @$core.pragma('dart2js:noInline') static Params getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); @@ -77,17 +68,16 @@ class Params extends $pb.GeneratedMessage { $core.String get key => $_getSZ(0); @$pb.TagNumber(1) - set key($core.String v) { - $_setString(0, v); - } + set key($core.String value) => $_setString(0, value); @$pb.TagNumber(1) $core.bool hasKey() => $_has(0); @$pb.TagNumber(1) - void clearKey() => clearField(1); + void clearKey() => $_clearField(1); } -const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = +const $core.bool _omitFieldNames = + $core.bool.fromEnvironment('protobuf.omit_field_names'); +const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names'); diff --git a/example_protobuf/lib/proto/params.pbenum.dart b/example_protobuf/lib/proto/params.pbenum.dart index 591ad2594..bb47236bf 100644 --- a/example_protobuf/lib/proto/params.pbenum.dart +++ b/example_protobuf/lib/proto/params.pbenum.dart @@ -1,10 +1,11 @@ +// This is a generated file - do not edit. // -// Generated code. Do not modify. -// source: proto/params.proto -// -// @dart = 2.12 +// Generated from proto/params.proto. + +// @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names, prefer_relative_imports diff --git a/example_protobuf/lib/proto/params.pbjson.dart b/example_protobuf/lib/proto/params.pbjson.dart index 357024d61..e170bb77f 100644 --- a/example_protobuf/lib/proto/params.pbjson.dart +++ b/example_protobuf/lib/proto/params.pbjson.dart @@ -1,13 +1,15 @@ +// This is a generated file - do not edit. // -// Generated code. Do not modify. -// source: proto/params.proto -// -// @dart = 2.12 +// Generated from proto/params.proto. + +// @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names, prefer_relative_imports +// ignore_for_file: unused_import import 'dart:convert' as $convert; import 'dart:core' as $core; diff --git a/example_protobuf/lib/proto/params.pbserver.dart b/example_protobuf/lib/proto/params.pbserver.dart deleted file mode 100644 index 4138d4bd3..000000000 --- a/example_protobuf/lib/proto/params.pbserver.dart +++ /dev/null @@ -1,13 +0,0 @@ -// -// Generated code. Do not modify. -// source: proto/params.proto -// -// @dart = 2.12 - -// ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names -// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import - -export 'params.pb.dart'; diff --git a/example_protobuf/lib/proto/result.pb.dart b/example_protobuf/lib/proto/result.pb.dart index 3f002bb50..953b40b2b 100644 --- a/example_protobuf/lib/proto/result.pb.dart +++ b/example_protobuf/lib/proto/result.pb.dart @@ -1,70 +1,62 @@ +// This is a generated file - do not edit. // -// Generated code. Do not modify. -// source: proto/result.proto -// -// @dart = 2.12 +// Generated from proto/result.proto. + +// @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names, prefer_relative_imports import 'dart:core' as $core; import 'package:protobuf/protobuf.dart' as $pb; +export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions; + class Result extends $pb.GeneratedMessage { factory Result({ $core.String? value, }) { - final $result = create(); - if (value != null) { - $result.value = value; - } - return $result; + final result = create(); + if (value != null) result.value = value; + return result; } - Result._() : super(); + Result._(); - factory Result.fromBuffer( - $core.List<$core.int> i, [ - $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY, - ]) => - create()..mergeFromBuffer(i, r); + factory Result.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); - factory Result.fromJson( - $core.String i, [ - $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY, - ]) => - create()..mergeFromJson(i, r); + factory Result.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); static final $pb.BuilderInfo _i = $pb.BuilderInfo( - _omitMessageNames ? '' : 'Result', - createEmptyInstance: create, - ) + _omitMessageNames ? '' : 'Result', + createEmptyInstance: create) ..aOS(1, _omitFieldNames ? '' : 'value') ..hasRequiredFields = false; - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version') - Result clone() => Result()..mergeFromMessage(this); + @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.') + Result clone() => deepCopy(); - @$core.Deprecated('Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version') + @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.') Result copyWith(void Function(Result) updates) => super.copyWith((message) => updates(message as Result)) as Result; + @$core.override $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') static Result create() => Result._(); + @$core.override Result createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); - @$core.pragma('dart2js:noInline') static Result getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); @@ -74,17 +66,16 @@ class Result extends $pb.GeneratedMessage { $core.String get value => $_getSZ(0); @$pb.TagNumber(1) - set value($core.String v) { - $_setString(0, v); - } + set value($core.String value) => $_setString(0, value); @$pb.TagNumber(1) $core.bool hasValue() => $_has(0); @$pb.TagNumber(1) - void clearValue() => clearField(1); + void clearValue() => $_clearField(1); } -const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = +const $core.bool _omitFieldNames = + $core.bool.fromEnvironment('protobuf.omit_field_names'); +const $core.bool _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names'); diff --git a/example_protobuf/lib/proto/result.pbenum.dart b/example_protobuf/lib/proto/result.pbenum.dart index d4845c81f..d99d6c7d1 100644 --- a/example_protobuf/lib/proto/result.pbenum.dart +++ b/example_protobuf/lib/proto/result.pbenum.dart @@ -1,10 +1,11 @@ +// This is a generated file - do not edit. // -// Generated code. Do not modify. -// source: proto/result.proto -// -// @dart = 2.12 +// Generated from proto/result.proto. + +// @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names, prefer_relative_imports diff --git a/example_protobuf/lib/proto/result.pbjson.dart b/example_protobuf/lib/proto/result.pbjson.dart index 2e56f81b5..8516e2410 100644 --- a/example_protobuf/lib/proto/result.pbjson.dart +++ b/example_protobuf/lib/proto/result.pbjson.dart @@ -1,13 +1,15 @@ +// This is a generated file - do not edit. // -// Generated code. Do not modify. -// source: proto/result.proto -// -// @dart = 2.12 +// Generated from proto/result.proto. + +// @dart = 3.3 // ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names, prefer_relative_imports +// ignore_for_file: unused_import import 'dart:convert' as $convert; import 'dart:core' as $core; diff --git a/example_protobuf/lib/proto/result.pbserver.dart b/example_protobuf/lib/proto/result.pbserver.dart deleted file mode 100644 index 24de55b00..000000000 --- a/example_protobuf/lib/proto/result.pbserver.dart +++ /dev/null @@ -1,13 +0,0 @@ -// -// Generated code. Do not modify. -// source: proto/result.proto -// -// @dart = 2.12 - -// ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names -// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import - -export 'result.pb.dart'; diff --git a/example_protobuf/proto/params.proto b/example_protobuf/proto/params.proto index 45ef6e68a..f13410e82 100644 --- a/example_protobuf/proto/params.proto +++ b/example_protobuf/proto/params.proto @@ -4,4 +4,4 @@ package examples.enumerations; message Params { string key = 1; -} \ No newline at end of file +} diff --git a/example_protobuf/proto/result.proto b/example_protobuf/proto/result.proto index 81f068105..c43f453f7 100644 --- a/example_protobuf/proto/result.proto +++ b/example_protobuf/proto/result.proto @@ -2,4 +2,4 @@ syntax = "proto3"; message Result { string value = 1; -} \ No newline at end of file +} diff --git a/example_protobuf/pubspec.yaml b/example_protobuf/pubspec.yaml index 37f2324af..ded27e239 100644 --- a/example_protobuf/pubspec.yaml +++ b/example_protobuf/pubspec.yaml @@ -2,30 +2,28 @@ name: retrofit_example description: example_protobuf version: 1.0.0+1 environment: - sdk: '>=3.3.0 <4.0.0' + sdk: ^3.10.0 dependencies: - dio: ^5.8.0 + dio: ^5.9.0 flutter: sdk: flutter - http_parser: ^4.0.2 + http_parser: ^4.1.2 json_annotation: ^4.9.0 logger: ^2.5.0 - protobuf: ^4.0.0 - retrofit: + protobuf: ^6.0.0 + retrofit: any dev_dependencies: - build_runner: ^2.4.0 - json_serializable: ^6.9.5 + build_runner: ^2.10.4 + json_serializable: ^6.11.2 lints: any mock_web_server: ^5.0.0-nullsafety.1 - retrofit_generator: + protoc_plugin: ^25.0.0 + retrofit_generator: any dependency_overrides: retrofit: path: ../retrofit retrofit_generator: path: ../generator - -flutter: - uses-material-design: true diff --git a/generator/lib/src/generator.dart b/generator/lib/src/generator.dart index 8200d0b54..db13032e0 100644 --- a/generator/lib/src/generator.dart +++ b/generator/lib/src/generator.dart @@ -11,7 +11,9 @@ import 'package:built_collection/built_collection.dart'; import 'package:code_builder/code_builder.dart'; import 'package:dart_style/dart_style.dart'; import 'package:dio/dio.dart'; -import 'package:protobuf/protobuf.dart' as protobuf; +import 'package:protobuf/protobuf.dart' + as protobuf + show GeneratedMessage, ProtobufEnum; import 'package:retrofit/retrofit.dart' as retrofit; import 'package:source_gen/source_gen.dart'; @@ -25,7 +27,9 @@ Builder generatorFactoryBuilder(BuilderOptions options) { [RetrofitGenerator(retrofitOptions)], 'retrofit', formatOutput: (code, version) { - final formattedCode = DartFormatter(languageVersion: version).format(code); + final formattedCode = DartFormatter( + languageVersion: version, + ).format(code); // Only add format suppressing comments if format_output is true (default) if (retrofitOptions.formatOutput ?? true) { return '// dart format off\n\n$formattedCode\n// dart format on\n'; diff --git a/generator/pubspec.yaml b/generator/pubspec.yaml index 92a912021..f3fdd9e77 100644 --- a/generator/pubspec.yaml +++ b/generator/pubspec.yaml @@ -8,7 +8,7 @@ topics: - rest - retrofit - codegen -version: 10.2.1 +version: 10.2.2 environment: sdk: '>=3.8.0 <4.0.0' @@ -18,9 +18,9 @@ dependencies: built_collection: ^5.1.1 code_builder: ^4.10.1 dart_style: ^3.1.1 - dio: ^5.8.0 - lean_builder: ^0.1.2 - protobuf: ^5.0.0 + dio: ^5.9.0 + lean_builder: ^0.1.4 + protobuf: ^6.0.0 retrofit: ^4.9.0 source_gen: '>=3.1.0 <5.0.0' diff --git a/generator/test/format_output_test.dart b/generator/test/format_output_test.dart index eaf649ba1..398076824 100644 --- a/generator/test/format_output_test.dart +++ b/generator/test/format_output_test.dart @@ -11,25 +11,19 @@ void main() { }); test('formatOutput is true when explicitly set to true', () { - final builderOptions = BuilderOptions({ - 'format_output': 'true', - }); + final builderOptions = BuilderOptions({'format_output': 'true'}); final options = RetrofitOptions.fromOptions(builderOptions); expect(options.formatOutput, isTrue); }); test('formatOutput is false when explicitly set to false', () { - final builderOptions = BuilderOptions({ - 'format_output': 'false', - }); + final builderOptions = BuilderOptions({'format_output': 'false'}); final options = RetrofitOptions.fromOptions(builderOptions); expect(options.formatOutput, isFalse); }); test('formatOutput handles non-boolean string values', () { - final builderOptions = BuilderOptions({ - 'format_output': 'False', - }); + final builderOptions = BuilderOptions({'format_output': 'False'}); final options = RetrofitOptions.fromOptions(builderOptions); // Should be false because it's not exactly 'true' expect(options.formatOutput, isFalse); @@ -45,18 +39,14 @@ void main() { }); test('creates builder with format_output set to false', () { - final builderOptions = BuilderOptions({ - 'format_output': 'false', - }); + final builderOptions = BuilderOptions({'format_output': 'false'}); final builder = generatorFactoryBuilder(builderOptions); expect(builder, isNotNull); expect(builder, isA()); }); test('creates builder with format_output set to true', () { - final builderOptions = BuilderOptions({ - 'format_output': 'true', - }); + final builderOptions = BuilderOptions({'format_output': 'true'}); final builder = generatorFactoryBuilder(builderOptions); expect(builder, isNotNull); expect(builder, isA()); diff --git a/generator/test/src/generator_test_src.dart b/generator/test/src/generator_test_src.dart index f2dd421b7..573a0b963 100644 --- a/generator/test/src/generator_test_src.dart +++ b/generator/test/src/generator_test_src.dart @@ -4,7 +4,7 @@ import 'package:dio/dio.dart' hide Headers; import 'package:retrofit/retrofit.dart'; import 'package:source_gen_test/annotations.dart'; -import 'query.pb.dart'; +import 'result.pb.dart'; class Resource {} diff --git a/generator/test/src/query.pb.dart b/generator/test/src/query.pb.dart deleted file mode 100644 index 70f4a043e..000000000 --- a/generator/test/src/query.pb.dart +++ /dev/null @@ -1,163 +0,0 @@ -// -// Generated code. Do not modify. -// source: proto/params.proto - -// ignore_for_file: annotate_overrides, camel_case_types, comment_references -// ignore_for_file: constant_identifier_names, library_prefixes -// ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: unnecessary_import, unnecessary_this, unused_import - -import 'dart:core' as $core; - -import 'package:protobuf/protobuf.dart' as $pb; - -class Params extends $pb.GeneratedMessage { - factory Params({$core.String? key}) { - final $result = create(); - if (key != null) { - $result.key = key; - } - return $result; - } - - Params._() : super(); - - factory Params.fromBuffer( - $core.List<$core.int> i, [ - $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY, - ]) => create()..mergeFromBuffer(i, r); - - factory Params.fromJson( - $core.String i, [ - $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY, - ]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = - $pb.BuilderInfo( - _omitMessageNames ? '' : 'Params', - createEmptyInstance: create, - ) - ..aOS(1, _omitFieldNames ? '' : 'key') - ..hasRequiredFields = false; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version', - ) - Params clone() => Params()..mergeFromMessage(this); - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version', - ) - Params copyWith(void Function(Params) updates) => - super.copyWith((message) => updates(message as Params)) as Params; - - $pb.BuilderInfo get info_ => _i; - - @$core.pragma('dart2js:noInline') - static Params create() => Params._(); - - Params createEmptyInstance() => create(); - - static $pb.PbList createRepeated() => $pb.PbList(); - - @$core.pragma('dart2js:noInline') - static Params getDefault() => - _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static Params? _defaultInstance; - - @$pb.TagNumber(1) - $core.String get key => $_getSZ(0); - - @$pb.TagNumber(1) - set key($core.String v) { - $_setString(0, v); - } - - @$pb.TagNumber(1) - $core.bool hasKey() => $_has(0); - - @$pb.TagNumber(1) - void clearKey() => clearField(1); -} - -class Result extends $pb.GeneratedMessage { - factory Result({$core.String? value}) { - final $result = create(); - if (value != null) { - $result.value = value; - } - return $result; - } - - Result._() : super(); - - factory Result.fromBuffer( - $core.List<$core.int> i, [ - $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY, - ]) => create()..mergeFromBuffer(i, r); - - factory Result.fromJson( - $core.String i, [ - $pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY, - ]) => create()..mergeFromJson(i, r); - - static final $pb.BuilderInfo _i = - $pb.BuilderInfo( - _omitMessageNames ? '' : 'Result', - createEmptyInstance: create, - ) - ..aOS(1, _omitFieldNames ? '' : 'value') - ..hasRequiredFields = false; - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' - 'Will be removed in next major version', - ) - Result clone() => Result()..mergeFromMessage(this); - - @$core.Deprecated( - 'Using this can add significant overhead to your binary. ' - 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' - 'Will be removed in next major version', - ) - Result copyWith(void Function(Result) updates) => - super.copyWith((message) => updates(message as Result)) as Result; - - $pb.BuilderInfo get info_ => _i; - - @$core.pragma('dart2js:noInline') - static Result create() => Result._(); - - Result createEmptyInstance() => create(); - - static $pb.PbList createRepeated() => $pb.PbList(); - - @$core.pragma('dart2js:noInline') - static Result getDefault() => - _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static Result? _defaultInstance; - - @$pb.TagNumber(1) - $core.String get value => $_getSZ(0); - - @$pb.TagNumber(1) - set value($core.String v) { - $_setString(0, v); - } - - @$pb.TagNumber(1) - $core.bool hasValue() => $_has(0); - - @$pb.TagNumber(1) - void clearValue() => clearField(1); -} - -const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names'); -const _omitMessageNames = $core.bool.fromEnvironment( - 'protobuf.omit_message_names', -); diff --git a/generator/test/src/result.pb.dart b/generator/test/src/result.pb.dart new file mode 100644 index 000000000..1abf742e3 --- /dev/null +++ b/generator/test/src/result.pb.dart @@ -0,0 +1,130 @@ +// This is a generated file - do not edit. +// +// Generated from proto/result.proto. + +// @dart = 3.3 + +// ignore_for_file: annotate_overrides, camel_case_types, comment_references +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names, prefer_relative_imports + +import 'dart:core' as $core; + +import 'package:protobuf/protobuf.dart' as $pb; + +export 'package:protobuf/protobuf.dart' show GeneratedMessageGenericExtensions; + +class Result extends $pb.GeneratedMessage { + factory Result({ + $core.String? value, + }) { + final result = create(); + if (value != null) result.value = value; + return result; + } + + Result._(); + + factory Result.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory Result.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Result', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'examples.enumerations'), + createEmptyInstance: create) + ..aOS(1, _omitFieldNames ? '' : 'value') + ..hasRequiredFields = false; + + @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.') + Result clone() => deepCopy(); + @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.') + Result copyWith(void Function(Result) updates) => + super.copyWith((message) => updates(message as Result)) as Result; + + @$core.override + $pb.BuilderInfo get info_ => _i; + + @$core.pragma('dart2js:noInline') + static Result create() => Result._(); + @$core.override + Result createEmptyInstance() => create(); + @$core.pragma('dart2js:noInline') + static Result getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Result? _defaultInstance; + + @$pb.TagNumber(1) + $core.String get value => $_getSZ(0); + @$pb.TagNumber(1) + set value($core.String value) => $_setString(0, value); + @$pb.TagNumber(1) + $core.bool hasValue() => $_has(0); + @$pb.TagNumber(1) + void clearValue() => $_clearField(1); +} + +class Params extends $pb.GeneratedMessage { + factory Params({ + $core.String? key, + }) { + final result = create(); + if (key != null) result.key = key; + return result; + } + + Params._(); + + factory Params.fromBuffer($core.List<$core.int> data, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromBuffer(data, registry); + factory Params.fromJson($core.String json, + [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => + create()..mergeFromJson(json, registry); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo( + _omitMessageNames ? '' : 'Params', + package: const $pb.PackageName( + _omitMessageNames ? '' : 'examples.enumerations'), + createEmptyInstance: create) + ..aOS(1, _omitFieldNames ? '' : 'key') + ..hasRequiredFields = false; + + @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.') + Params clone() => deepCopy(); + @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.') + Params copyWith(void Function(Params) updates) => + super.copyWith((message) => updates(message as Params)) as Params; + + @$core.override + $pb.BuilderInfo get info_ => _i; + + @$core.pragma('dart2js:noInline') + static Params create() => Params._(); + @$core.override + Params createEmptyInstance() => create(); + @$core.pragma('dart2js:noInline') + static Params getDefault() => + _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Params? _defaultInstance; + + @$pb.TagNumber(1) + $core.String get key => $_getSZ(0); + @$pb.TagNumber(1) + set key($core.String value) => $_setString(0, value); + @$pb.TagNumber(1) + $core.bool hasKey() => $_has(0); + @$pb.TagNumber(1) + void clearKey() => $_clearField(1); +} + +const $core.bool _omitFieldNames = + $core.bool.fromEnvironment('protobuf.omit_field_names'); +const $core.bool _omitMessageNames = + $core.bool.fromEnvironment('protobuf.omit_message_names'); diff --git a/generator/test/src/result.pbjson.dart b/generator/test/src/result.pbjson.dart new file mode 100644 index 000000000..dca12c425 --- /dev/null +++ b/generator/test/src/result.pbjson.dart @@ -0,0 +1,40 @@ +// This is a generated file - do not edit. +// +// Generated from proto/result.proto. + +// @dart = 3.3 + +// ignore_for_file: annotate_overrides, camel_case_types, comment_references +// ignore_for_file: constant_identifier_names +// ignore_for_file: curly_braces_in_flow_control_structures +// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes +// ignore_for_file: non_constant_identifier_names, prefer_relative_imports +// ignore_for_file: unused_import + +import 'dart:convert' as $convert; +import 'dart:core' as $core; +import 'dart:typed_data' as $typed_data; + +@$core.Deprecated('Use resultDescriptor instead') +const Result$json = { + '1': 'Result', + '2': [ + {'1': 'value', '3': 1, '4': 1, '5': 9, '10': 'value'}, + ], +}; + +/// Descriptor for `Result`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List resultDescriptor = + $convert.base64Decode('CgZSZXN1bHQSFAoFdmFsdWUYASABKAlSBXZhbHVl'); + +@$core.Deprecated('Use paramsDescriptor instead') +const Params$json = { + '1': 'Params', + '2': [ + {'1': 'key', '3': 1, '4': 1, '5': 9, '10': 'key'}, + ], +}; + +/// Descriptor for `Params`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List paramsDescriptor = + $convert.base64Decode('CgZQYXJhbXMSEAoDa2V5GAEgASgJUgNrZXk=');