@bufbuild/protobuf 1.1.1 → 1.2.1

package/dist/esm/google/protobuf/type_pb.js

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// @generated by protoc-gen-es v1.1.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v1.2.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/type.proto (package google.protobuf, syntax proto3)
 /* eslint-disable */
 import { proto3 } from "../../proto3.js";
@@ -37,18 +37,25 @@ export var Syntax;
      * @generated from enum value: SYNTAX_PROTO3 = 1;
      */
     Syntax[Syntax["PROTO3"] = 1] = "PROTO3";
+    /**
+     * Syntax `editions`.
+     *
+     * @generated from enum value: SYNTAX_EDITIONS = 2;
+     */
+    Syntax[Syntax["EDITIONS"] = 2] = "EDITIONS";
 })(Syntax || (Syntax = {}));
 // Retrieve enum metadata with: proto3.getEnumType(Syntax)
 proto3.util.setEnumType(Syntax, "google.protobuf.Syntax", [
     { no: 0, name: "SYNTAX_PROTO2" },
     { no: 1, name: "SYNTAX_PROTO3" },
+    { no: 2, name: "SYNTAX_EDITIONS" },
 ]);
 /**
  * A protocol buffer message type.
  *
  * @generated from message google.protobuf.Type
  */
-export class Type extends Message {
+class Type extends Message {
     constructor(data) {
         super();
         /**
@@ -81,6 +88,12 @@ export class Type extends Message {
          * @generated from field: google.protobuf.Syntax syntax = 6;
          */
         this.syntax = Syntax.PROTO2;
+        /**
+         * The source edition string, only valid when syntax is SYNTAX_EDITIONS.
+         *
+         * @generated from field: string edition = 7;
+         */
+        this.edition = "";
         proto3.util.initPartial(data, this);
     }
     static fromBinary(bytes, options) {
@@ -105,13 +118,15 @@ Type.fields = proto3.util.newFieldList(() => [
     { no: 4, name: "options", kind: "message", T: Option, repeated: true },
     { no: 5, name: "source_context", kind: "message", T: SourceContext },
     { no: 6, name: "syntax", kind: "enum", T: proto3.getEnumType(Syntax) },
+    { no: 7, name: "edition", kind: "scalar", T: 9 /* ScalarType.STRING */ },
 ]);
+export { Type };
 /**
  * A single field of a message type.
  *
  * @generated from message google.protobuf.Field
  */
-export class Field extends Message {
+class Field extends Message {
     constructor(data) {
         super();
         /**
@@ -205,6 +220,7 @@ Field.fields = proto3.util.newFieldList(() => [
     { no: 10, name: "json_name", kind: "scalar", T: 9 /* ScalarType.STRING */ },
     { no: 11, name: "default_value", kind: "scalar", T: 9 /* ScalarType.STRING */ },
 ]);
+export { Field };
 /**
  * Basic field types.
  *
@@ -393,7 +409,7 @@ proto3.util.setEnumType(Field_Cardinality, "google.protobuf.Field.Cardinality",
  *
  * @generated from message google.protobuf.Enum
  */
-export class Enum extends Message {
+class Enum extends Message {
     constructor(data) {
         super();
         /**
@@ -420,6 +436,12 @@ export class Enum extends Message {
          * @generated from field: google.protobuf.Syntax syntax = 5;
          */
         this.syntax = Syntax.PROTO2;
+        /**
+         * The source edition string, only valid when syntax is SYNTAX_EDITIONS.
+         *
+         * @generated from field: string edition = 6;
+         */
+        this.edition = "";
         proto3.util.initPartial(data, this);
     }
     static fromBinary(bytes, options) {
@@ -443,13 +465,15 @@ Enum.fields = proto3.util.newFieldList(() => [
     { no: 3, name: "options", kind: "message", T: Option, repeated: true },
     { no: 4, name: "source_context", kind: "message", T: SourceContext },
     { no: 5, name: "syntax", kind: "enum", T: proto3.getEnumType(Syntax) },
+    { no: 6, name: "edition", kind: "scalar", T: 9 /* ScalarType.STRING */ },
 ]);
+export { Enum };
 /**
  * Enum value definition.
  *
  * @generated from message google.protobuf.EnumValue
  */
-export class EnumValue extends Message {
+class EnumValue extends Message {
     constructor(data) {
         super();
         /**
@@ -492,13 +516,14 @@ EnumValue.fields = proto3.util.newFieldList(() => [
     { no: 2, name: "number", kind: "scalar", T: 5 /* ScalarType.INT32 */ },
     { no: 3, name: "options", kind: "message", T: Option, repeated: true },
 ]);
+export { EnumValue };
 /**
  * A protocol buffer option, which can be attached to a message, field,
  * enumeration, etc.
  *
  * @generated from message google.protobuf.Option
  */
-export class Option extends Message {
+class Option extends Message {
     constructor(data) {
         super();
         /**
@@ -531,3 +556,4 @@ Option.fields = proto3.util.newFieldList(() => [
     { no: 1, name: "name", kind: "scalar", T: 9 /* ScalarType.STRING */ },
     { no: 2, name: "value", kind: "message", T: Any },
 ]);
+export { Option };

package/dist/esm/google/protobuf/wrappers_pb.js

@@ -22,7 +22,7 @@ import { protoInt64 } from "../../proto-int64.js";
  *
  * @generated from message google.protobuf.DoubleValue
  */
-export class DoubleValue extends Message {
+class DoubleValue extends Message {
     constructor(data) {
         super();
         /**
@@ -75,6 +75,7 @@ DoubleValue.fieldWrapper = {
         return value.value;
     }
 };
+export { DoubleValue };
 /**
  * Wrapper message for `float`.
  *
@@ -82,7 +83,7 @@ DoubleValue.fieldWrapper = {
  *
  * @generated from message google.protobuf.FloatValue
  */
-export class FloatValue extends Message {
+class FloatValue extends Message {
     constructor(data) {
         super();
         /**
@@ -135,6 +136,7 @@ FloatValue.fieldWrapper = {
         return value.value;
     }
 };
+export { FloatValue };
 /**
  * Wrapper message for `int64`.
  *
@@ -142,7 +144,7 @@ FloatValue.fieldWrapper = {
  *
  * @generated from message google.protobuf.Int64Value
  */
-export class Int64Value extends Message {
+class Int64Value extends Message {
     constructor(data) {
         super();
         /**
@@ -195,6 +197,7 @@ Int64Value.fieldWrapper = {
         return value.value;
     }
 };
+export { Int64Value };
 /**
  * Wrapper message for `uint64`.
  *
@@ -202,7 +205,7 @@ Int64Value.fieldWrapper = {
  *
  * @generated from message google.protobuf.UInt64Value
  */
-export class UInt64Value extends Message {
+class UInt64Value extends Message {
     constructor(data) {
         super();
         /**
@@ -255,6 +258,7 @@ UInt64Value.fieldWrapper = {
         return value.value;
     }
 };
+export { UInt64Value };
 /**
  * Wrapper message for `int32`.
  *
@@ -262,7 +266,7 @@ UInt64Value.fieldWrapper = {
  *
  * @generated from message google.protobuf.Int32Value
  */
-export class Int32Value extends Message {
+class Int32Value extends Message {
     constructor(data) {
         super();
         /**
@@ -315,6 +319,7 @@ Int32Value.fieldWrapper = {
         return value.value;
     }
 };
+export { Int32Value };
 /**
  * Wrapper message for `uint32`.
  *
@@ -322,7 +327,7 @@ Int32Value.fieldWrapper = {
  *
  * @generated from message google.protobuf.UInt32Value
  */
-export class UInt32Value extends Message {
+class UInt32Value extends Message {
     constructor(data) {
         super();
         /**
@@ -375,6 +380,7 @@ UInt32Value.fieldWrapper = {
         return value.value;
     }
 };
+export { UInt32Value };
 /**
  * Wrapper message for `bool`.
  *
@@ -382,7 +388,7 @@ UInt32Value.fieldWrapper = {
  *
  * @generated from message google.protobuf.BoolValue
  */
-export class BoolValue extends Message {
+class BoolValue extends Message {
     constructor(data) {
         super();
         /**
@@ -435,6 +441,7 @@ BoolValue.fieldWrapper = {
         return value.value;
     }
 };
+export { BoolValue };
 /**
  * Wrapper message for `string`.
  *
@@ -442,7 +449,7 @@ BoolValue.fieldWrapper = {
  *
  * @generated from message google.protobuf.StringValue
  */
-export class StringValue extends Message {
+class StringValue extends Message {
     constructor(data) {
         super();
         /**
@@ -495,6 +502,7 @@ StringValue.fieldWrapper = {
         return value.value;
     }
 };
+export { StringValue };
 /**
  * Wrapper message for `bytes`.
  *
@@ -502,7 +510,7 @@ StringValue.fieldWrapper = {
  *
  * @generated from message google.protobuf.BytesValue
  */
-export class BytesValue extends Message {
+class BytesValue extends Message {
     constructor(data) {
         super();
         /**
@@ -555,3 +563,4 @@ BytesValue.fieldWrapper = {
         return value.value;
     }
 };
+export { BytesValue };

package/dist/esm/index.js

@@ -17,14 +17,11 @@ export { protoInt64 } from "./proto-int64.js";
 export { protoBase64 } from "./proto-base64.js";
 export { protoDelimited } from "./proto-delimited.js";
 export { codegenInfo } from "./codegen-info.js";
-export { Message, } from "./message.js";
+export { Message } from "./message.js";
 export { ScalarType } from "./field.js";
 export { MethodKind, MethodIdempotency } from "./service-type.js";
 export { WireType, BinaryWriter, BinaryReader } from "./binary-encoding.js";
-export {} from "./json-format.js";
-export {} from "./descriptor-set.js";
 export { createDescriptorSet } from "./create-descriptor-set.js";
-export {} from "./type-registry.js";
 export { createRegistry } from "./create-registry.js";
 export { createRegistryFromDescriptors } from "./create-registry-from-desc.js";
 // ideally, we would export these types with sub-path exports:

package/dist/esm/private/binary-format-common.js

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-import { BinaryReader, BinaryWriter, WireType, } from "../binary-encoding.js";
+import { BinaryReader, BinaryWriter, WireType } from "../binary-encoding.js";
 import { Message } from "../message.js";
 import { ScalarType } from "../field.js";
 import { wrapField } from "./field-wrapper.js";
@@ -109,14 +109,14 @@ export function makeBinaryFormatCommon() {
                         const messageType = field.T;
                         if (repeated) {
                             // safe to assume presence of array, oneof cannot contain repeated values
-                            target[localName].push(messageType.fromBinary(reader.bytes(), options));
+                            target[localName].push(readMessageField(reader, new messageType(), options));
                         }
                         else {
                             if (target[localName] instanceof Message) {
-                                target[localName].fromBinary(reader.bytes(), options);
+                                readMessageField(reader, target[localName], options);
                             }
                             else {
-                                target[localName] = messageType.fromBinary(reader.bytes(), options);
+                                target[localName] = readMessageField(reader, new messageType(), options);
                                 if (messageType.fieldWrapper &&
                                     !field.oneof &&
                                     !field.repeated) {
@@ -135,6 +135,13 @@ export function makeBinaryFormatCommon() {
         },
     };
 }
+// Read a message, avoiding MessageType.fromBinary() to re-use the
+// BinaryReadOptions and the IBinaryReader.
+function readMessageField(reader, message, options) {
+    const format = message.getType().runtime.bin;
+    format.readMessage(message, reader, reader.uint32(), options);
+    return message;
+}
 // Read a map field, expecting key field = 1, value field = 2
 function readMapEntry(field, reader, options) {
     const length = reader.uint32(), end = reader.pos + length;
@@ -154,7 +161,7 @@ function readMapEntry(field, reader, options) {
                         val = reader.int32();
                         break;
                     case "message":
-                        val = field.V.T.fromBinary(reader.bytes(), options);
+                        val = readMessageField(reader, new field.V.T(), options);
                         break;
                 }
                 break;
@@ -185,9 +192,40 @@ function readMapEntry(field, reader, options) {
     }
     return [key, val];
 }
+// Does not use scalarTypeInfo() for better performance.
 function readScalar(reader, type) {
-    let [, method] = scalarTypeInfo(type);
-    return reader[method]();
+    switch (type) {
+        case ScalarType.STRING:
+            return reader.string();
+        case ScalarType.BOOL:
+            return reader.bool();
+        case ScalarType.DOUBLE:
+            return reader.double();
+        case ScalarType.FLOAT:
+            return reader.float();
+        case ScalarType.INT32:
+            return reader.int32();
+        case ScalarType.INT64:
+            return reader.int64();
+        case ScalarType.UINT64:
+            return reader.uint64();
+        case ScalarType.FIXED64:
+            return reader.fixed64();
+        case ScalarType.BYTES:
+            return reader.bytes();
+        case ScalarType.FIXED32:
+            return reader.fixed32();
+        case ScalarType.SFIXED32:
+            return reader.sfixed32();
+        case ScalarType.SFIXED64:
+            return reader.sfixed64();
+        case ScalarType.SINT64:
+            return reader.sint64();
+        case ScalarType.UINT32:
+            return reader.uint32();
+        case ScalarType.SINT32:
+            return reader.sint32();
+    }
 }
 export function writeMapEntry(writer, options, field, key, value) {
     writer.tag(field.no, WireType.LengthDelimited);

package/dist/esm/private/message-type.js

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-import { Message, } from "../message.js";
+import { Message } from "../message.js";
 /**
  * Create a new message type using the given runtime.
  */

package/dist/esm/private/names.js

@@ -31,10 +31,12 @@ export function localName(desc) {
             const pkg = desc.file.proto.package;
             const offset = pkg === undefined ? 0 : pkg.length + 1;
             const name = desc.typeName.substring(offset).replace(/\./g, "_");
-            if (reservedIdent[name]) {
-                return name + "$";
-            }
-            return name;
+            // For services, we only care about safe identifiers, not safe object properties,
+            // but we have shipped v1 with a bug that respected object properties, and we
+            // do not want to introduce a breaking change, so we continue to escape for
+            // safe object properties.
+            // See https://github.com/bufbuild/protobuf-es/pull/391
+            return safeObjectProperty(safeIdentifier(name));
         }
         case "enum_value": {
             const sharedPrefix = desc.parent.sharedPrefix;
@@ -42,10 +44,7 @@ export function localName(desc) {
                 return desc.name;
             }
             const name = desc.name.substring(sharedPrefix.length);
-            if (reservedObjectProperties[name]) {
-                return name + "$";
-            }
-            return name;
+            return safeObjectProperty(name);
         }
         case "rpc": {
             let name = desc.name;
@@ -53,10 +52,7 @@ export function localName(desc) {
                 return name;
             }
             name = name[0].toLowerCase() + name.substring(1);
-            if (reservedObjectProperties[name]) {
-                return name + "$";
-            }
-            return name;
+            return safeObjectProperty(name);
         }
     }
 }
@@ -64,15 +60,12 @@ export function localName(desc) {
  * Returns the name of a field in generated code.
  */
 export function localFieldName(protoName, inOneof) {
-    let name = protoCamelCase(protoName);
+    const name = protoCamelCase(protoName);
     if (inOneof) {
         // oneof member names are not properties, but values of the `case` property.
         return name;
     }
-    if (reservedObjectProperties[name] || reservedMessageProperties[name]) {
-        name = name + "$";
-    }
-    return name;
+    return safeObjectProperty(safeMessageProperty(name));
 }
 /**
  * Returns the name of a oneof group in generated code.
@@ -149,91 +142,127 @@ function protoCamelCase(snakeCase) {
     }
     return b.join("");
 }
-// Names that cannot be used for identifiers, such as class names,
-// but _can_ be used for object properties.
-const reservedIdent = {
+/**
+ * Names that cannot be used for identifiers, such as class names,
+ * but _can_ be used for object properties.
+ */
+const reservedIdentifiers = new Set([
     // ECMAScript 2015 keywords
-    break: true,
-    case: true,
-    catch: true,
-    class: true,
-    const: true,
-    continue: true,
-    debugger: true,
-    default: true,
-    delete: true,
-    do: true,
-    else: true,
-    export: true,
-    extends: true,
-    false: true,
-    finally: true,
-    for: true,
-    function: true,
-    if: true,
-    import: true,
-    in: true,
-    instanceof: true,
-    new: true,
-    null: true,
-    return: true,
-    super: true,
-    switch: true,
-    this: true,
-    throw: true,
-    true: true,
-    try: true,
-    typeof: true,
-    var: true,
-    void: true,
-    while: true,
-    with: true,
-    yield: true,
+    "break",
+    "case",
+    "catch",
+    "class",
+    "const",
+    "continue",
+    "debugger",
+    "default",
+    "delete",
+    "do",
+    "else",
+    "export",
+    "extends",
+    "false",
+    "finally",
+    "for",
+    "function",
+    "if",
+    "import",
+    "in",
+    "instanceof",
+    "new",
+    "null",
+    "return",
+    "super",
+    "switch",
+    "this",
+    "throw",
+    "true",
+    "try",
+    "typeof",
+    "var",
+    "void",
+    "while",
+    "with",
+    "yield",
     // ECMAScript 2015 future reserved keywords
-    enum: true,
-    implements: true,
-    interface: true,
-    let: true,
-    package: true,
-    private: true,
-    protected: true,
-    public: true,
-    static: true,
+    "enum",
+    "implements",
+    "interface",
+    "let",
+    "package",
+    "private",
+    "protected",
+    "public",
+    "static",
     // Class name cannot be 'Object' when targeting ES5 with module CommonJS
-    Object: true,
+    "Object",
     // TypeScript keywords that cannot be used for types (as opposed to variables)
-    bigint: true,
-    number: true,
-    boolean: true,
-    string: true,
-    object: true,
+    "bigint",
+    "number",
+    "boolean",
+    "string",
+    "object",
     // Identifiers reserved for the runtime, so we can generate legible code
-    globalThis: true,
-    Uint8Array: true,
-    Partial: true,
-};
-// Names that cannot be used for object properties because they are reserved
-// by built-in JavaScript properties.
-const reservedObjectProperties = {
+    "globalThis",
+    "Uint8Array",
+    "Partial",
+]);
+/**
+ * Names that cannot be used for object properties because they are reserved
+ * by built-in JavaScript properties.
+ */
+const reservedObjectProperties = new Set([
     // names reserved by JavaScript
-    constructor: true,
-    toString: true,
-    toJSON: true,
-    valueOf: true,
-};
-// Names that cannot be used for object properties because they are reserved
-// by the runtime.
-const reservedMessageProperties = {
+    "constructor",
+    "toString",
+    "toJSON",
+    "valueOf",
+]);
+/**
+ * Names that cannot be used for object properties because they are reserved
+ * by the runtime.
+ */
+const reservedMessageProperties = new Set([
     // names reserved by the runtime
-    getType: true,
-    clone: true,
-    equals: true,
-    fromBinary: true,
-    fromJson: true,
-    fromJsonString: true,
-    toBinary: true,
-    toJson: true,
-    toJsonString: true,
+    "getType",
+    "clone",
+    "equals",
+    "fromBinary",
+    "fromJson",
+    "fromJsonString",
+    "toBinary",
+    "toJson",
+    "toJsonString",
     // names reserved by the runtime for the future
-    toObject: true,
+    "toObject",
+]);
+const fallback = (name) => `${name}$`;
+/**
+ * Will wrap names that are Object prototype properties or names reserved
+ * for `Message`s.
+ */
+const safeMessageProperty = (name) => {
+    if (reservedMessageProperties.has(name)) {
+        return fallback(name);
+    }
+    return name;
+};
+/**
+ * Names that cannot be used for object properties because they are reserved
+ * by built-in JavaScript properties.
+ */
+export const safeObjectProperty = (name) => {
+    if (reservedObjectProperties.has(name)) {
+        return fallback(name);
+    }
+    return name;
+};
+/**
+ * Names that can be used for identifiers or class properties
+ */
+export const safeIdentifier = (name) => {
+    if (reservedIdentifiers.has(name)) {
+        return fallback(name);
+    }
+    return name;
 };

package/dist/esm/private/util-common.js

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { setEnumType } from "./enum.js";
-import { Message, } from "../message.js";
+import { Message } from "../message.js";
 import { ScalarType } from "../field.js";
 import { scalarEquals } from "./scalars.js";
 /* eslint-disable @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-return,@typescript-eslint/no-unsafe-argument,no-case-declarations */