protoc 30.2.0 → 31.0.0-rc1

package/README.md

@@ -1,7 +1,7 @@
 protoc
 ======
 
-This package provides the Protobuf compiler `protoc` <!-- inject: release.tag_name -->v30.2<!-- end -->.
+This package provides the Protobuf compiler `protoc` <!-- inject: release.tag_name -->v31.0-rc1<!-- end -->.
 
 ```shell script
 npm install --save-dev protoc

package/assets.json

@@ -1,39 +1,39 @@
 [
   {
-    "name": "protoc-30.2-linux-aarch_64.zip",
-    "browser_download_url": "https://github.com/protocolbuffers/protobuf/releases/download/v30.2/protoc-30.2-linux-aarch_64.zip",
+    "name": "protoc-31.0-rc-1-linux-aarch_64.zip",
+    "browser_download_url": "https://github.com/protocolbuffers/protobuf/releases/download/v31.0-rc1/protoc-31.0-rc-1-linux-aarch_64.zip",
     "platform": "linux",
     "arch": "arm64",
     "dotExe": false,
     "executable": "protoc-linux-aarch_64"
   },
   {
-    "name": "protoc-30.2-linux-x86_64.zip",
-    "browser_download_url": "https://github.com/protocolbuffers/protobuf/releases/download/v30.2/protoc-30.2-linux-x86_64.zip",
+    "name": "protoc-31.0-rc-1-linux-x86_64.zip",
+    "browser_download_url": "https://github.com/protocolbuffers/protobuf/releases/download/v31.0-rc1/protoc-31.0-rc-1-linux-x86_64.zip",
     "platform": "linux",
     "arch": "x64",
     "dotExe": false,
     "executable": "protoc-linux-x86_64"
   },
   {
-    "name": "protoc-30.2-osx-aarch_64.zip",
-    "browser_download_url": "https://github.com/protocolbuffers/protobuf/releases/download/v30.2/protoc-30.2-osx-aarch_64.zip",
+    "name": "protoc-31.0-rc-1-osx-aarch_64.zip",
+    "browser_download_url": "https://github.com/protocolbuffers/protobuf/releases/download/v31.0-rc1/protoc-31.0-rc-1-osx-aarch_64.zip",
     "platform": "darwin",
     "arch": "arm64",
     "dotExe": false,
     "executable": "protoc-osx-aarch_64"
   },
   {
-    "name": "protoc-30.2-osx-x86_64.zip",
-    "browser_download_url": "https://github.com/protocolbuffers/protobuf/releases/download/v30.2/protoc-30.2-osx-x86_64.zip",
+    "name": "protoc-31.0-rc-1-osx-x86_64.zip",
+    "browser_download_url": "https://github.com/protocolbuffers/protobuf/releases/download/v31.0-rc1/protoc-31.0-rc-1-osx-x86_64.zip",
     "platform": "darwin",
     "arch": "x64",
     "dotExe": false,
     "executable": "protoc-osx-x86_64"
   },
   {
-    "name": "protoc-30.2-win64.zip",
-    "browser_download_url": "https://github.com/protocolbuffers/protobuf/releases/download/v30.2/protoc-30.2-win64.zip",
+    "name": "protoc-31.0-rc-1-win64.zip",
+    "browser_download_url": "https://github.com/protocolbuffers/protobuf/releases/download/v31.0-rc1/protoc-31.0-rc-1-win64.zip",
     "platform": "win32",
     "arch": "x64",
     "dotExe": true,

package/include/google/protobuf/descriptor.proto

@@ -113,6 +113,10 @@ message FileDescriptorProto {
   // For Google-internal migration only. Do not use.
   repeated int32 weak_dependency = 11;
 
+  // Names of files imported by this file purely for the purpose of providing
+  // option extensions. These are excluded from the dependency list above.
+  repeated string option_dependency = 15;
+
   // All top-level definitions in this file.
   repeated DescriptorProto message_type = 4;
   repeated EnumDescriptorProto enum_type = 5;
@@ -176,6 +180,9 @@ message DescriptorProto {
   // Reserved field names, which may not be used by fields in the same message.
   // A given name may only be reserved once.
   repeated string reserved_name = 10;
+
+  // Support for `export` and `local` keywords on enums.
+  optional SymbolVisibility visibility = 11;
 }
 
 message ExtensionRangeOptions {
@@ -372,6 +379,9 @@ message EnumDescriptorProto {
   // Reserved enum value names, which may not be reused. A given name may only
   // be reserved once.
   repeated string reserved_name = 5;
+
+  // Support for `export` and `local` keywords on enums.
+  optional SymbolVisibility visibility = 6;
 }
 
 // Describes a value within an enum.
@@ -1121,6 +1131,37 @@ message FeatureSet {
     edition_defaults = { edition: EDITION_2024, value: "STYLE2024" }
   ];
 
+  message VisibilityFeature {
+    enum DefaultSymbolVisibility {
+      DEFAULT_SYMBOL_VISIBILITY_UNKNOWN = 0;
+
+      // Default pre-EDITION_2024, all UNSET visibility are export.
+      EXPORT_ALL = 1;
+
+      // All top-level symbols default to export, nested default to local.
+      EXPORT_TOP_LEVEL = 2;
+
+      // All symbols default to local.
+      LOCAL_ALL = 3;
+
+      // All symbols local by default. Nested types cannot be exported.
+      // With special case caveat for message { enum {} reserved 1 to max; }
+      // This is the recommended setting for new protos.
+      STRICT = 4;
+    }
+    reserved 1 to max;
+  }
+  optional VisibilityFeature.DefaultSymbolVisibility default_symbol_visibility =
+      8 [
+        retention = RETENTION_SOURCE,
+        targets = TARGET_TYPE_FILE,
+        feature_support = {
+          edition_introduced: EDITION_2024,
+        },
+        edition_defaults = { edition: EDITION_LEGACY, value: "EXPORT_ALL" },
+        edition_defaults = { edition: EDITION_2024, value: "EXPORT_TOP_LEVEL" }
+      ];
+
   reserved 999;
 
   extensions 1000 to 9994 [
@@ -1363,3 +1404,14 @@ message GeneratedCodeInfo {
     optional Semantic semantic = 5;
   }
 }
+
+// Describes the 'visibility' of a symbol with respect to the proto import
+// system. Symbols can only be imported when the visibility rules do not prevent
+// it (ex: local symbols cannot be imported).  Visibility modifiers can only set
+// on `message` and `enum` as they are the only types available to be referenced
+// from other files.
+enum SymbolVisibility {
+  VISIBILITY_UNSET = 0;
+  VISIBILITY_LOCAL = 1;
+  VISIBILITY_EXPORT = 2;
+}

package/include/google/protobuf/java_features.proto

@@ -40,8 +40,7 @@ message JavaFeatures {
     edition_defaults = { edition: EDITION_PROTO3, value: "false" }
   ];
 
-  // The UTF8 validation strategy to use.  See go/editions-utf8-validation for
-  // more information on this feature.
+  // The UTF8 validation strategy to use.
   enum Utf8Validation {
     // Invalid default, which should never be used.
     UTF8_VALIDATION_UNKNOWN = 0;
@@ -68,6 +67,18 @@ message JavaFeatures {
     edition_defaults = { edition: EDITION_LEGACY, value: "DEFAULT" }
   ];
 
+  // Allows creation of large Java enums, extending beyond the standard
+  // constant limits imposed by the Java language.
+  optional bool large_enum = 3 [
+    retention = RETENTION_RUNTIME,
+    targets = TARGET_TYPE_ENUM,
+    targets = TARGET_TYPE_FILE,
+    feature_support = {
+      edition_introduced: EDITION_2024,
+    },
+    edition_defaults = { edition: EDITION_LEGACY, value: "false" }
+  ];
+
   // Whether to use the old default outer class name scheme, or the new feature
   // which adds a "Proto" suffix to the outer class name.
   //
@@ -84,4 +95,36 @@ message JavaFeatures {
     edition_defaults = { edition: EDITION_LEGACY, value: "true" },
     edition_defaults = { edition: EDITION_2024, value: "false" }
   ];
+
+  message NestInFileClassFeature {
+    enum NestInFileClass {
+      // Invalid default, which should never be used.
+      NEST_IN_FILE_CLASS_UNKNOWN = 0;
+      // Do not nest the generated class in the file class.
+      NO = 1;
+      // Nest the generated class in the file class.
+      YES = 2;
+      // Fall back to the `java_multiple_files` option. Users won't be able to
+      // set this option.
+      LEGACY = 3 [feature_support = {
+        edition_introduced: EDITION_2024
+        edition_removed: EDITION_2024
+      }];
+    }
+    reserved 1 to max;
+  }
+
+  // Whether to nest the generated class in the generated file class. This is
+  // only applicable to *top-level* messages, enums, and services.
+  optional NestInFileClassFeature.NestInFileClass nest_in_file_class = 5 [
+    retention = RETENTION_SOURCE,
+    targets = TARGET_TYPE_MESSAGE,
+    targets = TARGET_TYPE_ENUM,
+    targets = TARGET_TYPE_SERVICE,
+    feature_support = {
+      edition_introduced: EDITION_2024,
+    },
+    edition_defaults = { edition: EDITION_LEGACY, value: "LEGACY" },
+    edition_defaults = { edition: EDITION_2024, value: "NO" }
+  ];
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "protoc",
-  "version": "30.2.0",
-  "upstreamVersion": "v30.2",
+  "version": "31.0.0-rc1",
+  "upstreamVersion": "v31.0-rc1",
   "description": "Installs the protocol buffer compiler \"protoc\" for you.",
   "bin": {
     "protoc": "protoc.cjs"