protoc 33.5.0 → 34.0.0-rc2

package/README.md

@@ -1,7 +1,7 @@
 protoc
 ======
 
-This package provides the Protobuf compiler `protoc` <!-- inject: release.tag_name -->v33.5<!-- end -->.
+This package provides the Protobuf compiler `protoc` <!-- inject: release.tag_name -->v34.0-rc2<!-- end -->.
 
 ```shell script
 npm install --save-dev protoc

package/assets.json

@@ -1,39 +1,39 @@
 [
   {
-    "name": "protoc-33.5-linux-aarch_64.zip",
-    "browser_download_url": "https://github.com/protocolbuffers/protobuf/releases/download/v33.5/protoc-33.5-linux-aarch_64.zip",
+    "name": "protoc-34.0-rc-2-linux-aarch_64.zip",
+    "browser_download_url": "https://github.com/protocolbuffers/protobuf/releases/download/v34.0-rc2/protoc-34.0-rc-2-linux-aarch_64.zip",
     "platform": "linux",
     "arch": "arm64",
     "dotExe": false,
     "executable": "protoc-linux-aarch_64"
   },
   {
-    "name": "protoc-33.5-linux-x86_64.zip",
-    "browser_download_url": "https://github.com/protocolbuffers/protobuf/releases/download/v33.5/protoc-33.5-linux-x86_64.zip",
+    "name": "protoc-34.0-rc-2-linux-x86_64.zip",
+    "browser_download_url": "https://github.com/protocolbuffers/protobuf/releases/download/v34.0-rc2/protoc-34.0-rc-2-linux-x86_64.zip",
     "platform": "linux",
     "arch": "x64",
     "dotExe": false,
     "executable": "protoc-linux-x86_64"
   },
   {
-    "name": "protoc-33.5-osx-aarch_64.zip",
-    "browser_download_url": "https://github.com/protocolbuffers/protobuf/releases/download/v33.5/protoc-33.5-osx-aarch_64.zip",
+    "name": "protoc-34.0-rc-2-osx-aarch_64.zip",
+    "browser_download_url": "https://github.com/protocolbuffers/protobuf/releases/download/v34.0-rc2/protoc-34.0-rc-2-osx-aarch_64.zip",
     "platform": "darwin",
     "arch": "arm64",
     "dotExe": false,
     "executable": "protoc-osx-aarch_64"
   },
   {
-    "name": "protoc-33.5-osx-x86_64.zip",
-    "browser_download_url": "https://github.com/protocolbuffers/protobuf/releases/download/v33.5/protoc-33.5-osx-x86_64.zip",
+    "name": "protoc-34.0-rc-2-osx-x86_64.zip",
+    "browser_download_url": "https://github.com/protocolbuffers/protobuf/releases/download/v34.0-rc2/protoc-34.0-rc-2-osx-x86_64.zip",
     "platform": "darwin",
     "arch": "x64",
     "dotExe": false,
     "executable": "protoc-osx-x86_64"
   },
   {
-    "name": "protoc-33.5-win64.zip",
-    "browser_download_url": "https://github.com/protocolbuffers/protobuf/releases/download/v33.5/protoc-33.5-win64.zip",
+    "name": "protoc-34.0-rc-2-win64.zip",
+    "browser_download_url": "https://github.com/protocolbuffers/protobuf/releases/download/v34.0-rc2/protoc-34.0-rc-2-win64.zip",
     "platform": "win32",
     "arch": "x64",
     "dotExe": true,

package/include/google/protobuf/descriptor.proto

@@ -476,7 +476,17 @@ message FileOptions {
   // named by java_outer_classname.  However, the wrapper class will still be
   // generated to contain the file's getDescriptor() method as well as any
   // top-level extensions defined in the file.
-  optional bool java_multiple_files = 10 [default = false];
+  optional bool java_multiple_files = 10 [
+    default = false,
+    feature_support = {
+      edition_introduced: EDITION_PROTO2
+      edition_removed: EDITION_2024
+      removal_error: "This behavior is enabled by default in editions 2024 and above. "
+                     "To disable it, you can set `features.(pb.java).nest_in_file_class = YES` "
+                     "on individual messages, enums, or services."
+
+    }
+  ];
 
   // This option does nothing.
   optional bool java_generate_equals_and_hash = 20 [deprecated=true];
@@ -825,6 +835,10 @@ message FieldOptions {
     // this one, the last default assigned will be used, and proto files will
     // not be able to override it.
     optional Edition edition_removed = 4;
+
+    // The removal error text if this feature is used after the edition it was
+    // removed in.
+    optional string removal_error = 5;
   }
   optional FeatureSupport feature_support = 22;
 

package/include/google/protobuf/field_mask.proto

@@ -152,24 +152,22 @@ option cc_enable_arenas = true;
 // An implementation may provide options to override this default behavior for
 // repeated and message fields.
 //
-// In order to reset a field's value to the default, the field must
-// be in the mask and set to the default value in the provided resource.
-// Hence, in order to reset all fields of a resource, provide a default
-// instance of the resource and set all fields in the mask, or do
-// not provide a mask as described below.
-//
-// If a field mask is not present on update, the operation applies to
-// all fields (as if a field mask of all fields has been specified).
-// Note that in the presence of schema evolution, this may mean that
-// fields the client does not know and has therefore not filled into
-// the request will be reset to their default. If this is unwanted
-// behavior, a specific service may require a client to always specify
-// a field mask, producing an error if not.
-//
-// As with get operations, the location of the resource which
-// describes the updated values in the request message depends on the
-// operation kind. In any case, the effect of the field mask is
-// required to be honored by the API.
+// Note that libraries which implement FieldMask resolution have various
+// different behaviors in the face of empty masks or the special "*" mask.
+// When implementing a service you should confirm these cases have the
+// appropriate behavior in the underlying FieldMask library that you desire,
+// and you may need to special case those cases in your application code if
+// the underlying field mask library behavior differs from your intended
+// service semantics.
+//
+// Update methods implementing https://google.aip.dev/134
+// - MUST support the special value * meaning "full replace"
+// - MUST treat an omitted field mask as "replace fields which are present".
+//
+// Other methods implementing https://google.aip.dev/157
+// - SHOULD support the special value "*" to mean "get all".
+// - MUST treat an omitted field mask to mean "get all", unless otherwise
+// documented.
 //
 // ## Considerations for HTTP REST
 //

package/include/google/protobuf/go_features.proto

@@ -80,4 +80,33 @@ message GoFeatures {
       value: "STRIP_ENUM_PREFIX_KEEP"
     }
   ];
+
+  // Wrap the OptimizeMode enum in a message for scoping:
+  // This way, users can type shorter names (SPEED, CODE_SIZE).
+  message OptimizeModeFeature {
+    // The name of this enum matches OptimizeMode in descriptor.proto.
+    enum OptimizeMode {
+      // OPTIMIZE_MODE_UNSPECIFIED results in falling back to the default
+      // (optimize for code size), but needs to be a separate value to distinguish
+      // between an explicitly set optimize mode or a missing optimize mode.
+      OPTIMIZE_MODE_UNSPECIFIED = 0;
+      SPEED = 1;
+      CODE_SIZE = 2;
+      // There is no enum entry for LITE_RUNTIME (descriptor.proto),
+      // because Go Protobuf does not have the concept of a lite runtime.
+    }
+  }
+
+  optional OptimizeModeFeature.OptimizeMode optimize_mode = 4 [
+    retention = RETENTION_RUNTIME,
+    targets = TARGET_TYPE_MESSAGE,
+    targets = TARGET_TYPE_FILE,
+    feature_support = {
+      edition_introduced: EDITION_2024,
+    },
+    edition_defaults = {
+      edition: EDITION_LEGACY,
+      value: "OPTIMIZE_MODE_UNSPECIFIED"
+    }
+  ];
 }

package/include/google/protobuf/timestamp.proto

@@ -112,8 +112,8 @@ option csharp_namespace = "Google.Protobuf.WellKnownTypes";
 // {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional
 // seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution),
 // are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone
-// is required. A proto3 JSON serializer should always use UTC (as indicated by
-// "Z") when printing the Timestamp type and a proto3 JSON parser should be
+// is required. A ProtoJSON serializer should always use UTC (as indicated by
+// "Z") when printing the Timestamp type and a ProtoJSON parser should be
 // able to accept both UTC and other timezones (as indicated by an offset).
 //
 // For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past
@@ -132,7 +132,7 @@ option csharp_namespace = "Google.Protobuf.WellKnownTypes";
 //
 message Timestamp {
   // Represents seconds of UTC time since Unix epoch 1970-01-01T00:00:00Z. Must
-  // be between -315576000000 and 315576000000 inclusive (which corresponds to
+  // be between -62135596800 and 253402300799 inclusive (which corresponds to
   // 0001-01-01T00:00:00Z to 9999-12-31T23:59:59Z).
   int64 seconds = 1;
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "protoc",
-  "version": "33.5.0",
-  "upstreamVersion": "v33.5",
+  "version": "34.0.0-rc2",
+  "upstreamVersion": "v34.0-rc2",
   "description": "Installs the protocol buffer compiler \"protoc\" for you.",
   "bin": {
     "protoc": "protoc.cjs"