protoc 22.5.0 → 23.0.0-rc1

package/README.md

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

package/assets.json

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

package/include/google/protobuf/any.proto

@@ -68,7 +68,7 @@ option csharp_namespace = "Google.Protobuf.WellKnownTypes";
 //       foo = any.unpack(Foo.getDefaultInstance());
 //     }
 //
-// Example 3: Pack and unpack a message in Python.
+//  Example 3: Pack and unpack a message in Python.
 //
 //     foo = Foo(...)
 //     any = Any()
@@ -78,7 +78,7 @@ option csharp_namespace = "Google.Protobuf.WellKnownTypes";
 //       any.Unpack(foo)
 //       ...
 //
-// Example 4: Pack and unpack a message in Go
+//  Example 4: Pack and unpack a message in Go
 //
 //      foo := &pb.Foo{...}
 //      any, err := anypb.New(foo)
@@ -98,7 +98,7 @@ option csharp_namespace = "Google.Protobuf.WellKnownTypes";
 // name "y.z".
 //
 // JSON
-//
+// ====
 // The JSON representation of an `Any` value uses the regular
 // representation of the deserialized, embedded message, with an
 // additional field `@type` which contains the type URL. Example:

package/include/google/protobuf/api.proto

@@ -166,7 +166,7 @@ message Method {
 // The mixin construct implies that all methods in `AccessControl` are
 // also declared with same name and request/response types in
 // `Storage`. A documentation generator or annotation processor will
-// see the effective `Storage.GetAcl` method after inheriting
+// see the effective `Storage.GetAcl` method after inherting
 // documentation and annotations as follows:
 //
 //     service Storage {

package/include/google/protobuf/descriptor.proto

@@ -133,6 +133,50 @@ message ExtensionRangeOptions {
   // The parser stores options it doesn't recognize here. See above.
   repeated UninterpretedOption uninterpreted_option = 999;
 
+  message Declaration {
+    // The extension number declared within the extension range.
+    optional int32 number = 1;
+
+    // The fully-qualified name of the extension field. There must be a leading
+    // dot in front of the full name.
+    optional string full_name = 2;
+
+    // The fully-qualified type name of the extension field. Unlike
+    // Metadata.type, Declaration.type must have a leading dot for messages
+    // and enums.
+    optional string type = 3;
+
+    // Deprecated. Please use "repeated".
+    optional bool is_repeated = 4 [deprecated = true];
+
+    // If true, indicates that the number is reserved in the extension range,
+    // and any extension field with the number will fail to compile. Set this
+    // when a declared extension field is deleted.
+    optional bool reserved = 5;
+
+    // If true, indicates that the extension must be defined as repeated.
+    // Otherwise the extension must be defined as optional.
+    optional bool repeated = 6;
+  }
+
+  // go/protobuf-stripping-extension-declarations
+  // Like Metadata, but we use a repeated field to hold all extension
+  // declarations. This should avoid the size increases of transforming a large
+  // extension range into small ranges in generated binaries.
+  repeated Declaration declaration = 2 [retention = RETENTION_SOURCE];
+
+  // The verification state of the extension range.
+  enum VerificationState {
+    // All the extensions of the range must be declared.
+    DECLARATION = 0;
+    UNVERIFIED = 1;
+  }
+
+  // The verification state of the range.
+  // TODO(b/278783756): flip the default to DECLARATION once all empty ranges
+  // are marked as UNVERIFIED.
+  optional VerificationState verification = 3 [default = UNVERIFIED];
+
   // Clients can define custom options in extensions of this message. See above.
   extensions 1000 to max;
 }
@@ -540,13 +584,21 @@ message MessageOptions {
 message FieldOptions {
   // The ctype option instructs the C++ code generator to use a different
   // representation of the field than it normally would.  See the specific
-  // options below.  This option is not yet implemented in the open source
-  // release -- sorry, we'll try to include it in a future version!
+  // options below.  This option is only implemented to support use of
+  // [ctype=CORD] and [ctype=STRING] (the default) on non-repeated fields of
+  // type "bytes" in the open source release -- sorry, we'll try to include
+  // other types in a future version!
   optional CType ctype = 1 [default = STRING];
   enum CType {
     // Default mode.
     STRING = 0;
 
+    // The option [ctype=CORD] may be applied to a non-repeated field of type
+    // "bytes". It indicates that in C++, the data should be stored in a Cord
+    // instead of a string.  For very large strings, this may reduce memory
+    // fragmentation. It may also allow better performance when parsing from a
+    // Cord, or when parsing with aliasing enabled, as the parsed Cord may then
+    // alias the original buffer.
     CORD = 1;
 
     STRING_PIECE = 2;
@@ -659,7 +711,8 @@ message FieldOptions {
     TARGET_TYPE_METHOD = 9;
   }
 
-  optional OptionTargetType target = 18;
+  optional OptionTargetType target = 18 [deprecated = true];
+  repeated OptionTargetType targets = 19;
 
   // The parser stores options it doesn't recognize here. See above.
   repeated UninterpretedOption uninterpreted_option = 999;

package/include/google/protobuf/struct.proto

@@ -80,7 +80,7 @@ message Value {
 // `NullValue` is a singleton enumeration to represent the null value for the
 // `Value` type union.
 //
-//  The JSON representation for `NullValue` is JSON `null`.
+// The JSON representation for `NullValue` is JSON `null`.
 enum NullValue {
   // Null value.
   NULL_VALUE = 0;

package/include/google/protobuf/timestamp.proto

@@ -127,7 +127,7 @@ option csharp_namespace = "Google.Protobuf.WellKnownTypes";
 // [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with
 // the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use
 // the Joda Time's [`ISODateTimeFormat.dateTime()`](
-// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D
+// http://joda-time.sourceforge.net/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime()
 // ) to obtain a formatter capable of generating timestamps in this format.
 //
 message Timestamp {

package/include/google/protobuf/type.proto

@@ -57,6 +57,8 @@ message Type {
   SourceContext source_context = 5;
   // The source syntax.
   Syntax syntax = 6;
+  // The source edition string, only valid when syntax is SYNTAX_EDITIONS.
+  string edition = 7;
 }
 
 // A single field of a message type.
@@ -151,6 +153,8 @@ message Enum {
   SourceContext source_context = 4;
   // The source syntax.
   Syntax syntax = 5;
+  // The source edition string, only valid when syntax is SYNTAX_EDITIONS.
+  string edition = 6;
 }
 
 // Enum value definition.
@@ -184,4 +188,6 @@ enum Syntax {
   SYNTAX_PROTO2 = 0;
   // Syntax `proto3`.
   SYNTAX_PROTO3 = 1;
+  // Syntax `editions`.
+  SYNTAX_EDITIONS = 2;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "protoc",
-  "version": "22.5.0",
-  "upstreamVersion": "v22.5",
+  "version": "23.0.0-rc1",
+  "upstreamVersion": "v23.0-rc1",
   "description": "Installs the protocol buffer compiler \"protoc\" for you.",
   "bin": {
     "protoc": "protoc.cjs"