Follow Protobuf Enum style through a new cli option "protobuf-enum-style" #1045

Spiritus2424 · 2025-08-28T01:39:44Z

This PR changes the enum generation to convert protobuf enum definition following the protobuf style guideline to respect dart naming convention at the end.

It is essential to take into account that people will follow the Protobuf style guideline and naming convention and that developer will expect the dart protoc plugin to match the dart naming conventions.

#372 Also motivates this change.

I tried to keep everything as compatible as possible. To not expose breaking change, I hide the new enum generation under an option (false by default) protobuf-enum-style.

Close #372

google-cla · 2025-08-28T01:39:49Z

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

…efix from enum value and UpperSnakeCase to CamelCase

…style

Currently `deepCopy` and `clone` create an empty message, and then merge the cloned message into the empty message. This is slow as merge needs to validate each element added to the message. In this PR we instead directly copy the field set, and deeply copy map, list, and message fields. deepCopy benchmark results: | | Before | After | Diff | |------------------|---------|---------|--------| | AOT | 238 us | 151 us | -36% | | dart2js -O4 | 242 us | 140 us | -42% | | dart2wasm -O2 | 230 us | 123 us | -46% | | JIT | 189 us | 104 us | -44% | This CL is tested internally in cl/794080754. Fixes google#60.

This fixes handling of unknown enum values in repeated and map fields and in top-level fields. Current behavior: - Unknown enums in map and repeated fields throw an exception. - Unknown enums in top-level fields reset the field value to the default one. With this PR we just "ignore" the values: - Unknown enums in map and repeated fields are skipped. - Unknown enums in top-level fields do not reset the field's value to the default. Fixes google#849.

Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…d code (google#1040) In `binary_decode_packed` benchmarks we used "sink" variables to write the decoded values, and printed these sinks at the end to make sure they're not dropped. Do the same in the rest of the benchmarks to make sure no code is eliminated by a sufficiently smart compiler or VM. Just as a sanity check I compared the numbers before and after this change, when compiled to Wasm with `-O2`. The numbers do not change in a consistent (reproducible) and significant way. It's still good to be safe and use the benchmark results to avoid dropping code.

… gitignore (google#1041)

@js

In a declaration like @js('JSON') extension type _JSON._(JSObject _) implements JSObject { @js('JSON.stringify') external static JSString _stringify(JSObject value); } When I call `_JSON._stringify(...)`, dart2js calls `JSON.stringify`, but dart2wasm calls `JSON.JSON.stringify`, which is wrong. Reading [1] it looks like the annotation `JSON.stringify` should just be `stringify`. If I do that the code works with both dart2wasm and dart2js. (I've reported dart2wasm's handling of the annotations above and we'll work on a fix for it on dart2wasm.) This change is not tested on the CI because when compiling with dart2wasm we use the JS decoder library used by the VM, which doesn't use JS interop. I tested this manually with the patch: diff --git a/protobuf/lib/src/protobuf/json/json.dart b/protobuf/lib/src/protobuf/json/json.dart index 05d1ac1..70b6a7c 100644 --- a/protobuf/lib/src/protobuf/json/json.dart +++ b/protobuf/lib/src/protobuf/json/json.dart @@ -13,7 +13,7 @@ import '../utils.dart'; // Use json_vm.dart with VM and dart2wasm, json_web.dart with dart2js. // json_web.dart uses JS interop for parsing, and JS interop is too slow on // Wasm. VM's patch performs better in Wasm. -export 'json_vm.dart' if (dart.library.html) 'json_web.dart'; +export 'json_vm.dart' if (dart.library.js_interop) 'json_web.dart'; Map<String, dynamic> writeToJsonMap(FieldSet fs) { dynamic convertToMap(dynamic fieldValue, int fieldType) { [1]: https://dart.dev/interop/js-interop/usage#js

Keep the symbols to get useful perf outputs.

Spiritus2424

I added comments to help the reviewer understand what the changes are and why this does not bring any breaking change.

@osa1

Spiritus2424 · 2025-08-29T16:25:39Z

protoc_plugin/lib/src/enum_generator.dart

+      // Generate Dart name for the enum value
+      String dartName;
+      final isProtobufEnumStyle =
+          parent.fileGen?.options.protobufEnumStyle ?? false;
+      if (isProtobufEnumStyle) {
+        // Strip enum prefix from protobuf-style enum values
+        final strippedName = stripEnumPrefix(descriptor.name, value.name);
+        dartName = avoidInitialUnderscore(strippedName);
+      } else {
+        // Use original style
+        dartName = avoidInitialUnderscore(value.name);
+      }
+
      dartNames[value.name] = disambiguateName(
-        avoidInitialUnderscore(value.name),
+        dartName,


If the ProtobufEnumStyle is not defined, I keep the orignal way of doing to not incorporate breaking change

Spiritus2424 · 2025-08-29T16:26:58Z

protoc_plugin/lib/src/options.dart

+class ProtobufEnumStyleParser implements SingleOptionParser {
+  bool protobufEnumStyleEnabled = false;
+
+  @override
+  void parse(String name, String? value, OnError onError) {
+    if (value != null) {
+      onError('Invalid protobuf-enum-style option. No value expected.');
+      return;
+    }
+    protobufEnumStyleEnabled = true;
+  }
+}
+


New argument to enable protobuf enum style parsing. By default, the value is false to not incorporate breaking change!

Spiritus2424 · 2025-08-29T16:28:31Z

protoc_plugin/test/goldens/enum_complex_protobuf_style.pbenum.dart

Adding a new golden test to validate protobuf enum style

Spiritus2424 · 2025-08-29T16:28:38Z

protoc_plugin/test/goldens/enum_complex_protobuf_style.pbenum.dart.meta

Adding a new golden test to validate protobuf enum style

Spiritus2424 · 2025-08-29T16:28:46Z

protoc_plugin/test/goldens/enum_protobuf_style.pbenum.dart

Adding a new golden test to validate protobuf enum style

Spiritus2424 · 2025-08-29T16:28:52Z

protoc_plugin/test/goldens/enum_protobuf_style.pbenum.dart.meta

Adding a new golden test to validate protobuf enum style

Spiritus2424 · 2025-08-29T16:29:24Z

protoc_plugin/test/goldens/enum_without_protobuf_style.pbenum.dart

Adding a new golden test to validate that we keep the old behavior if the argument is not set

Spiritus2424 · 2025-08-29T16:29:42Z

protoc_plugin/test/goldens/enum_without_protobuf_style.pbenum.dart.meta

Adding a new golden test to validate that we keep the old behavior if the argument is not set

Spiritus2424 force-pushed the master branch from a0376a4 to d007558 Compare August 28, 2025 01:48

Spiritus2424 and others added 14 commits August 28, 2025 02:05

add protobuf-enum-style parameter to avoid breaking change

f473e49

add helper function to convert titleCase to UpperCase and StripEnumPr…

8bdd3e1

…efix from enum value and UpperSnakeCase to CamelCase

add golden files for complex enum

0f41caf

add golden files for simple enum example

4f8f6ca

add golden files for enum example without protobuf style

f9fb48e

add unit test to cover enum with protobuf style and without protobuf …

f97ba90

…style

modify enum generator to take into account protobuf enum style argument

7e6d158

Bump actions/checkout from 3.5.3 to 4.2.2 (google#1036)

0d9c258

Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Update benchmark builder to use -O2 with dart2wasm, add output dir to…

a9dd9f0

… gitignore (google#1041)

Compile dart2wasm benchmarks with --no-strip-wasm (google#1044)

e34c90e

Keep the symbols to get useful perf outputs.

Spiritus2424 force-pushed the master branch from 0328255 to e34c90e Compare August 28, 2025 02:05

Merge branch 'google:master' into master

e1d8792

Spiritus2424 commented Aug 29, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Follow Protobuf Enum style through a new cli option "protobuf-enum-style" #1045

Follow Protobuf Enum style through a new cli option "protobuf-enum-style" #1045

Spiritus2424 commented Aug 28, 2025 •

edited

Loading

Uh oh!

google-cla bot commented Aug 28, 2025

Uh oh!

Spiritus2424 left a comment

Uh oh!

Spiritus2424 Aug 29, 2025

Uh oh!

Spiritus2424 Aug 29, 2025

Uh oh!

Spiritus2424 Aug 29, 2025

Uh oh!

Spiritus2424 Aug 29, 2025

Uh oh!

Spiritus2424 Aug 29, 2025

Uh oh!

Spiritus2424 Aug 29, 2025

Uh oh!

Spiritus2424 Aug 29, 2025

Uh oh!

Spiritus2424 Aug 29, 2025

Uh oh!

Uh oh!

Follow Protobuf Enum style through a new cli option "protobuf-enum-style" #1045

Are you sure you want to change the base?

Follow Protobuf Enum style through a new cli option "protobuf-enum-style" #1045

Conversation

Spiritus2424 commented Aug 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

google-cla bot commented Aug 28, 2025

Uh oh!

Spiritus2424 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Spiritus2424 commented Aug 28, 2025 •

edited

Loading