@bufbuild/protobuf 0.0.4 → 0.0.7

package/dist/cjs/index.js

@@ -27,7 +27,43 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-// To avoid circular imports when the wkt import from ./index.js, we
-// use a separate ./index-runtime.js
-__exportStar(require("./index-runtime.js"), exports);
-__exportStar(require("./index-wkt.js"), exports);
+exports.BinaryReader = exports.BinaryWriter = exports.WireType = exports.DescriptorSet = exports.DescriptorRegistry = exports.TypeRegistry = exports.MethodIdempotency = exports.MethodKind = exports.ScalarType = exports.Message = exports.protoBase64 = exports.protoInt64 = exports.proto2 = exports.proto3 = void 0;
+var proto3_js_1 = require("./proto3.js");
+Object.defineProperty(exports, "proto3", { enumerable: true, get: function () { return proto3_js_1.proto3; } });
+var proto2_js_1 = require("./proto2.js");
+Object.defineProperty(exports, "proto2", { enumerable: true, get: function () { return proto2_js_1.proto2; } });
+var proto_int64_js_1 = require("./proto-int64.js");
+Object.defineProperty(exports, "protoInt64", { enumerable: true, get: function () { return proto_int64_js_1.protoInt64; } });
+var proto_base64_js_1 = require("./proto-base64.js");
+Object.defineProperty(exports, "protoBase64", { enumerable: true, get: function () { return proto_base64_js_1.protoBase64; } });
+var message_js_1 = require("./message.js");
+Object.defineProperty(exports, "Message", { enumerable: true, get: function () { return message_js_1.Message; } });
+var field_js_1 = require("./field.js");
+Object.defineProperty(exports, "ScalarType", { enumerable: true, get: function () { return field_js_1.ScalarType; } });
+var service_type_js_1 = require("./service-type.js");
+Object.defineProperty(exports, "MethodKind", { enumerable: true, get: function () { return service_type_js_1.MethodKind; } });
+Object.defineProperty(exports, "MethodIdempotency", { enumerable: true, get: function () { return service_type_js_1.MethodIdempotency; } });
+var type_registry_js_1 = require("./type-registry.js");
+Object.defineProperty(exports, "TypeRegistry", { enumerable: true, get: function () { return type_registry_js_1.TypeRegistry; } });
+var descriptor_registry_js_1 = require("./descriptor-registry.js");
+Object.defineProperty(exports, "DescriptorRegistry", { enumerable: true, get: function () { return descriptor_registry_js_1.DescriptorRegistry; } });
+var descriptor_set_js_1 = require("./descriptor-set.js");
+Object.defineProperty(exports, "DescriptorSet", { enumerable: true, get: function () { return descriptor_set_js_1.DescriptorSet; } });
+var binary_encoding_js_1 = require("./binary-encoding.js");
+Object.defineProperty(exports, "WireType", { enumerable: true, get: function () { return binary_encoding_js_1.WireType; } });
+Object.defineProperty(exports, "BinaryWriter", { enumerable: true, get: function () { return binary_encoding_js_1.BinaryWriter; } });
+Object.defineProperty(exports, "BinaryReader", { enumerable: true, get: function () { return binary_encoding_js_1.BinaryReader; } });
+var json_format_js_1 = require("./json-format.js");
+// ideally, we would export these types with sub-path exports:
+__exportStar(require("./google/protobuf/compiler/plugin_pb.js"), exports);
+__exportStar(require("./google/protobuf/api_pb.js"), exports);
+__exportStar(require("./google/protobuf/any_pb.js"), exports);
+__exportStar(require("./google/protobuf/descriptor_pb.js"), exports);
+__exportStar(require("./google/protobuf/duration_pb.js"), exports);
+__exportStar(require("./google/protobuf/empty_pb.js"), exports);
+__exportStar(require("./google/protobuf/field_mask_pb.js"), exports);
+__exportStar(require("./google/protobuf/source_context_pb.js"), exports);
+__exportStar(require("./google/protobuf/struct_pb.js"), exports);
+__exportStar(require("./google/protobuf/timestamp_pb.js"), exports);
+__exportStar(require("./google/protobuf/type_pb.js"), exports);
+__exportStar(require("./google/protobuf/wrappers_pb.js"), exports);

package/dist/cjs/message.js

@@ -84,8 +84,9 @@ class Message {
      * Serialize the message to a JSON string.
      */
     toJsonString(options) {
+        var _a;
         const value = this.toJson(options);
-        return JSON.stringify(value, null, options?.prettySpaces ?? 0);
+        return JSON.stringify(value, null, (_a = options === null || options === void 0 ? void 0 : options.prettySpaces) !== null && _a !== void 0 ? _a : 0);
     }
     /**
      * Retrieve the MessageType of this message - a singleton that represents

package/dist/cjs/package.json

@@ -0,0 +1 @@
+{"type":"commonjs"}

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

@@ -32,17 +32,18 @@ const writeDefaults = {
     writerFactory: () => new binary_encoding_js_1.BinaryWriter(),
 };
 function makeReadOptions(options) {
-    return options ? { ...readDefaults, ...options } : readDefaults;
+    return options ? Object.assign(Object.assign({}, readDefaults), options) : readDefaults;
 }
 function makeWriteOptions(options) {
-    return options ? { ...writeDefaults, ...options } : writeDefaults;
+    return options ? Object.assign(Object.assign({}, writeDefaults), options) : writeDefaults;
 }
 function makeBinaryFormatCommon() {
     return {
         makeReadOptions,
         makeWriteOptions,
         listUnknownFields(message) {
-            return message[unknownFieldsSymbol] ?? [];
+            var _a;
+            return (_a = message[unknownFieldsSymbol]) !== null && _a !== void 0 ? _a : [];
         },
         discardUnknownFields(message) {
             delete message[unknownFieldsSymbol];

package/dist/cjs/private/binary-format-proto2.js

@@ -18,9 +18,7 @@ const field_js_1 = require("../field.js");
 const binary_format_common_js_1 = require("./binary-format-common.js");
 /* eslint-disable @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unnecessary-condition, @typescript-eslint/strict-boolean-expressions, no-case-declarations, prefer-const */
 function makeBinaryFormatProto2() {
-    return {
-        ...(0, binary_format_common_js_1.makeBinaryFormatCommon)(),
-        writeMessage(message, writer, options) {
+    return Object.assign(Object.assign({}, (0, binary_format_common_js_1.makeBinaryFormatCommon)()), { writeMessage(message, writer, options) {
             const type = message.getType();
             let field;
             try {
@@ -84,7 +82,7 @@ function makeBinaryFormatProto2() {
             }
             catch (e) {
                 let m = field
-                    ? `cannot encode field ${type.typeName}.${field?.name} to binary`
+                    ? `cannot encode field ${type.typeName}.${field === null || field === void 0 ? void 0 : field.name} to binary`
                     : `cannot encode message ${type.typeName} to binary`;
                 let r = e instanceof Error ? e.message : String(e);
                 throw new Error(m + (r.length > 0 ? `: ${r}` : ""));
@@ -93,7 +91,6 @@ function makeBinaryFormatProto2() {
                 this.writeUnknownFields(message, writer);
             }
             return writer;
-        },
-    };
+        } });
 }
 exports.makeBinaryFormatProto2 = makeBinaryFormatProto2;

package/dist/cjs/private/binary-format-proto3.js

@@ -18,9 +18,7 @@ const field_js_1 = require("../field.js");
 const binary_format_common_js_1 = require("./binary-format-common.js");
 /* eslint-disable @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unnecessary-condition, @typescript-eslint/strict-boolean-expressions, prefer-const, no-case-declarations */
 function makeBinaryFormatProto3() {
-    return {
-        ...(0, binary_format_common_js_1.makeBinaryFormatCommon)(),
-        writeMessage(message, writer, options) {
+    return Object.assign(Object.assign({}, (0, binary_format_common_js_1.makeBinaryFormatCommon)()), { writeMessage(message, writer, options) {
             const type = message.getType();
             for (const field of type.fields.byNumber()) {
                 let value, // this will be our field value, whether it is member of a oneof or regular field
@@ -76,7 +74,6 @@ function makeBinaryFormatProto3() {
                 this.writeUnknownFields(message, writer);
             }
             return writer;
-        },
-    };
+        } });
 }
 exports.makeBinaryFormatProto3 = makeBinaryFormatProto3;

package/dist/cjs/private/enum.js

@@ -82,7 +82,7 @@ exports.makeEnumType = makeEnumType;
 function makeEnum(typeName, values, opt) {
     const enumObject = {};
     for (const value of values) {
-        const name = makeEnumValueName(value, opt?.sharedPrefix);
+        const name = makeEnumValueName(value, opt === null || opt === void 0 ? void 0 : opt.sharedPrefix);
         enumObject[name] = value.no;
         enumObject[value.no] = name;
     }

package/dist/cjs/private/json-format-common.js

@@ -32,10 +32,10 @@ const jsonWriteDefaults = {
     prettySpaces: 0,
 };
 function makeReadOptions(options) {
-    return options ? { ...jsonReadDefaults, ...options } : jsonReadDefaults;
+    return options ? Object.assign(Object.assign({}, jsonReadDefaults), options) : jsonReadDefaults;
 }
 function makeWriteOptions(options) {
-    return options ? { ...jsonWriteDefaults, ...options } : jsonWriteDefaults;
+    return options ? Object.assign(Object.assign({}, jsonWriteDefaults), options) : jsonWriteDefaults;
 }
 function makeJsonFormatCommon(makeWriteField) {
     const writeField = makeWriteField(writeEnum, writeScalar);
@@ -46,7 +46,7 @@ function makeJsonFormatCommon(makeWriteField) {
             if (json == null || Array.isArray(json) || typeof json != "object") {
                 throw new Error(`cannot decode message ${type.typeName} from JSON: ${this.debug(json)}`);
             }
-            message = message ?? new type();
+            message = message !== null && message !== void 0 ? message : new type();
             const oneofSeen = {};
             for (const [jsonKey, jsonValue] of Object.entries(json)) {
                 const field = type.fields.findJsonName(jsonKey);
@@ -386,13 +386,14 @@ function readEnum(type, json, ignoreUnknownFields) {
         case "string":
             const value = type.findName(json);
             if (value || ignoreUnknownFields) {
-                return value?.no;
+                return value === null || value === void 0 ? void 0 : value.no;
             }
             break;
     }
     throw new Error(`cannot decode enum ${type.typeName} from JSON: ${debugJsonValue(json)}`);
 }
 function writeEnum(type, value, emitIntrinsicDefault, enumAsInteger) {
+    var _a;
     if (value === undefined) {
         return value;
     }
@@ -407,7 +408,7 @@ function writeEnum(type, value, emitIntrinsicDefault, enumAsInteger) {
         return null;
     }
     const val = type.findNumber(value);
-    return val?.name ?? value; // if we don't know the enum value, just return the number
+    return (_a = val === null || val === void 0 ? void 0 : val.name) !== null && _a !== void 0 ? _a : value; // if we don't know the enum value, just return the number
 }
 function writeScalar(type, value, emitIntrinsicDefault) {
     if (value === undefined) {

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

@@ -19,7 +19,8 @@ const message_js_1 = require("../message.js");
  * Create a new message type using the given runtime.
  */
 function makeMessageType(runtime, typeName, fields, opt) {
-    const localName = opt?.localName ?? typeName.substring(typeName.lastIndexOf(".") + 1);
+    var _a;
+    const localName = (_a = opt === null || opt === void 0 ? void 0 : opt.localName) !== null && _a !== void 0 ? _a : typeName.substring(typeName.lastIndexOf(".") + 1);
     const type = {
         [localName]: function (data) {
             runtime.util.initFields(this);

package/dist/cjs/proto-int64.js

@@ -18,7 +18,7 @@ const varint_js_1 = require("./google/varint.js");
 function makeInt64Support() {
     const dv = new DataView(new ArrayBuffer(8));
     // note that Safari 14 implements BigInt, but not the DataView methods
-    const ok = globalThis.BigInt !== undefined && // eslint-disable-line @typescript-eslint/no-unnecessary-condition -- conditional for BigInt is very much necessary
+    const ok = globalThis.BigInt !== undefined &&
         typeof dv.getBigInt64 === "function" &&
         typeof dv.getBigUint64 === "function" &&
         typeof dv.setBigInt64 === "function" &&

package/dist/cjs/proto2.js

@@ -24,9 +24,7 @@ const json_format_proto2_js_1 = require("./private/json-format-proto2.js");
 /**
  * Provides functionality for messages defined with the proto2 syntax.
  */
-exports.proto2 = (0, proto_runtime_js_1.makeProtoRuntime)("proto2", (0, json_format_proto2_js_1.makeJsonFormatProto2)(), (0, binary_format_proto2_js_1.makeBinaryFormatProto2)(), {
-    ...(0, util_common_js_1.makeUtilCommon)(),
-    newFieldList(fields) {
+exports.proto2 = (0, proto_runtime_js_1.makeProtoRuntime)("proto2", (0, json_format_proto2_js_1.makeJsonFormatProto2)(), (0, binary_format_proto2_js_1.makeBinaryFormatProto2)(), Object.assign(Object.assign({}, (0, util_common_js_1.makeUtilCommon)()), { newFieldList(fields) {
         return new field_list_js_1.InternalFieldList(fields, normalizeFieldInfosProto2);
     },
     initFields(target) {
@@ -55,10 +53,10 @@ exports.proto2 = (0, proto_runtime_js_1.makeProtoRuntime)("proto2", (0, json_for
                     break;
             }
         }
-    },
-});
+    } }));
 /* eslint-disable @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-argument */
 function normalizeFieldInfosProto2(fieldInfos) {
+    var _a, _b, _c;
     const r = [];
     let o;
     for (const field of typeof fieldInfos == "function"
@@ -66,10 +64,10 @@ function normalizeFieldInfosProto2(fieldInfos) {
         : fieldInfos) {
         const f = field;
         f.localName = (0, names_js_1.makeFieldName)(field.name, field.oneof !== undefined);
-        f.jsonName = field.jsonName ?? (0, names_js_1.makeJsonName)(field.name);
-        f.repeated = field.repeated ?? false;
+        f.jsonName = (_a = field.jsonName) !== null && _a !== void 0 ? _a : (0, names_js_1.makeJsonName)(field.name);
+        f.repeated = (_b = field.repeated) !== null && _b !== void 0 ? _b : false;
         // In contrast to proto3, repeated fields are unpacked except when explicitly specified.
-        f.packed = field.packed ?? false;
+        f.packed = (_c = field.packed) !== null && _c !== void 0 ? _c : false;
         // We do not surface options at this time
         // f.options = field.options ?? emptyReadonlyObject;
         if (field.oneof !== undefined) {

package/dist/cjs/proto3.js

@@ -26,9 +26,7 @@ const names_js_1 = require("./private/names.js");
 /**
  * Provides functionality for messages defined with the proto3 syntax.
  */
-exports.proto3 = (0, proto_runtime_js_1.makeProtoRuntime)("proto3", (0, json_format_proto3_js_1.makeJsonFormatProto3)(), (0, binary_format_proto3_js_1.makeBinaryFormatProto3)(), {
-    ...(0, util_common_js_1.makeUtilCommon)(),
-    newFieldList(fields) {
+exports.proto3 = (0, proto_runtime_js_1.makeProtoRuntime)("proto3", (0, json_format_proto3_js_1.makeJsonFormatProto3)(), (0, binary_format_proto3_js_1.makeBinaryFormatProto3)(), Object.assign(Object.assign({}, (0, util_common_js_1.makeUtilCommon)()), { newFieldList(fields) {
         return new field_list_js_1.InternalFieldList(fields, normalizeFieldInfosProto3);
     },
     initFields(target) {
@@ -59,10 +57,10 @@ exports.proto3 = (0, proto_runtime_js_1.makeProtoRuntime)("proto3", (0, json_for
                     break;
             }
         }
-    },
-});
+    } }));
 /* eslint-disable @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-argument */
 function normalizeFieldInfosProto3(fieldInfos) {
+    var _a, _b, _c;
     const r = [];
     let o;
     for (const field of typeof fieldInfos == "function"
@@ -70,19 +68,18 @@ function normalizeFieldInfosProto3(fieldInfos) {
         : fieldInfos) {
         const f = field;
         f.localName = (0, names_js_1.makeFieldName)(field.name, field.oneof !== undefined);
-        f.jsonName = field.jsonName ?? (0, names_js_1.makeJsonName)(field.name);
-        f.repeated = field.repeated ?? false;
+        f.jsonName = (_a = field.jsonName) !== null && _a !== void 0 ? _a : (0, names_js_1.makeJsonName)(field.name);
+        f.repeated = (_b = field.repeated) !== null && _b !== void 0 ? _b : false;
         // From the proto3 language guide:
         // > In proto3, repeated fields of scalar numeric types are packed by default.
         // This information is incomplete - according to the conformance tests, BOOL
         // and ENUM are packed by default as well. This means only STRING and BYTES
         // are not packed by default, which makes sense because they are length-delimited.
         f.packed =
-            field.packed ??
-                (field.kind == "enum" ||
-                    (field.kind == "scalar" &&
-                        field.T != field_js_1.ScalarType.BYTES &&
-                        field.T != field_js_1.ScalarType.STRING));
+            (_c = field.packed) !== null && _c !== void 0 ? _c : (field.kind == "enum" ||
+                (field.kind == "scalar" &&
+                    field.T != field_js_1.ScalarType.BYTES &&
+                    field.T != field_js_1.ScalarType.STRING));
         // We do not surface options at this time
         // f.options = field.options ?? emptyReadonlyObject;
         if (field.oneof !== undefined) {

package/dist/cjs/type-registry.js

@@ -15,7 +15,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypeRegistry = void 0;
 /**
- * TypeRegistry is a basic type registry
+ * TypeRegistry is a simple registry for all message, enum, or service types.
  */
 class TypeRegistry {
     constructor() {
@@ -23,35 +23,80 @@ class TypeRegistry {
         this.enums = {};
         this.services = {};
     }
+    /**
+     * Find a message type by its protobuf type name.
+     */
     findMessage(typeName) {
         return this.messages[typeName];
     }
+    /**
+     * Find an enum type by its protobuf type name.
+     */
     findEnum(typeName) {
         return this.enums[typeName];
     }
+    /**
+     * Find a service type by its protobuf type name.
+     */
     findService(typeName) {
         return this.services[typeName];
     }
+    /**
+     * Create a new TypeRegistry from the given types.
+     */
+    static from(...types) {
+        const registry = new TypeRegistry();
+        for (const type of types) {
+            registry.add(type);
+        }
+        return registry;
+    }
+    /**
+     * @deprecated use TypeRegistry.from()
+     */
+    static fromIterable(types) {
+        return TypeRegistry.from(...types);
+    }
+    /**
+     * @deprecated use TypeRegistry.from()
+     */
+    static fromTypes(...types) {
+        return TypeRegistry.from(...types);
+    }
+    /**
+     * Add a type to the registry. For messages, the types used in message
+     * fields are added recursively. For services, the message types used
+     * for requests and responses are added recursively.
+     */
     add(type) {
         if ("fields" in type) {
-            this.messages[type.typeName] = type;
+            if (!this.findMessage(type.typeName)) {
+                this.messages[type.typeName] = type;
+                for (const field of type.fields.list()) {
+                    if (field.kind == "message") {
+                        this.add(field.T);
+                    }
+                    else if (field.kind == "map" && field.V.kind == "message") {
+                        this.add(field.V.T);
+                    }
+                    else if (field.kind == "enum") {
+                        this.add(field.T);
+                    }
+                }
+            }
         }
         else if ("methods" in type) {
-            this.services[type.typeName] = type;
+            if (!this.findService(type.typeName)) {
+                this.services[type.typeName] = type;
+                for (const method of Object.values(type.methods)) {
+                    this.add(method.I);
+                    this.add(method.O);
+                }
+            }
         }
         else {
             this.enums[type.typeName] = type;
         }
     }
-    static fromIterable(types) {
-        const r = new TypeRegistry();
-        for (const t of types) {
-            r.add(t);
-        }
-        return r;
-    }
-    static fromTypes(...types) {
-        return TypeRegistry.fromIterable(types);
-    }
 }
 exports.TypeRegistry = TypeRegistry;

package/dist/esm/binary-encoding.js

@@ -64,7 +64,7 @@ export class BinaryWriter {
          * Previous fork states.
          */
         this.stack = [];
-        this.textEncoder = textEncoder ?? new TextEncoder();
+        this.textEncoder = textEncoder !== null && textEncoder !== void 0 ? textEncoder : new TextEncoder();
         this.chunks = [];
         this.buf = [];
     }
@@ -279,7 +279,7 @@ export class BinaryReader {
         this.len = buf.length;
         this.pos = 0;
         this.view = new DataView(buf.buffer, buf.byteOffset, buf.byteLength);
-        this.textDecoder = textDecoder ?? new TextDecoder();
+        this.textDecoder = textDecoder !== null && textDecoder !== void 0 ? textDecoder : new TextDecoder();
     }
     /**
      * Reads a tag - field number and wire type.

package/dist/esm/descriptor-registry.js

@@ -62,7 +62,7 @@ export class DescriptorRegistry {
         this.enums = {};
         this.messages = {};
         this.services = {};
-        this.ds = descriptorSet ?? new DescriptorSet();
+        this.ds = descriptorSet !== null && descriptorSet !== void 0 ? descriptorSet : new DescriptorSet();
         if (replaceWkt) {
             for (const mt of wkMessages) {
                 this.messages["." + mt.typeName] = mt;
@@ -173,8 +173,9 @@ export class DescriptorRegistry {
     }
 }
 function makeTypeLocalName(type) {
+    var _a;
     const typeName = type.typeName;
-    const packagePrefix = (type.file.proto.package ?? "") + ".";
+    const packagePrefix = ((_a = type.file.proto.package) !== null && _a !== void 0 ? _a : "") + ".";
     if (!typeName.startsWith(packagePrefix)) {
         return type.name;
     }
@@ -203,32 +204,23 @@ function makeMapFieldInfo(field, resolver) {
     if (field.map.value.message) {
         const messageType = resolver.findMessage(field.map.value.message.typeName);
         assert(messageType, `message "${field.map.value.message.typeName}" for ${field.toString()} not found`);
-        return {
-            ...base,
-            V: {
+        return Object.assign(Object.assign({}, base), { V: {
                 kind: "message",
                 T: messageType,
-            },
-        };
+            } });
     }
     if (field.map.value.enum) {
         const enumType = resolver.findEnum(field.map.value.enum.typeName);
         assert(enumType, `enum "${field.map.value.enum.typeName}" for ${field.toString()} not found`);
-        return {
-            ...base,
-            V: {
+        return Object.assign(Object.assign({}, base), { V: {
                 kind: "enum",
                 T: enumType,
-            },
-        };
+            } });
     }
-    return {
-        ...base,
-        V: {
+    return Object.assign(Object.assign({}, base), { V: {
             kind: "scalar",
             T: field.map.value.scalarType,
-        },
-    };
+        } });
 }
 function makeScalarFieldInfo(field) {
     const base = {
@@ -238,25 +230,13 @@ function makeScalarFieldInfo(field) {
         T: field.scalarType,
     };
     if (field.repeated) {
-        return {
-            ...base,
-            repeated: true,
-            packed: field.packed,
-            oneof: undefined,
-            T: field.scalarType,
-        };
+        return Object.assign(Object.assign({}, base), { repeated: true, packed: field.packed, oneof: undefined, T: field.scalarType });
     }
     if (field.oneof) {
-        return {
-            ...base,
-            oneof: field.oneof.name,
-        };
+        return Object.assign(Object.assign({}, base), { oneof: field.oneof.name });
     }
     if (field.optional) {
-        return {
-            ...base,
-            opt: true,
-        };
+        return Object.assign(Object.assign({}, base), { opt: true });
     }
     return base;
 }
@@ -270,24 +250,13 @@ function makeMessageFieldInfo(field, resolver) {
         T: messageType,
     };
     if (field.repeated) {
-        return {
-            ...base,
-            repeated: true,
-            packed: field.packed,
-            oneof: undefined,
-        };
+        return Object.assign(Object.assign({}, base), { repeated: true, packed: field.packed, oneof: undefined });
     }
     if (field.oneof) {
-        return {
-            ...base,
-            oneof: field.oneof.name,
-        };
+        return Object.assign(Object.assign({}, base), { oneof: field.oneof.name });
     }
     if (field.optional) {
-        return {
-            ...base,
-            opt: true,
-        };
+        return Object.assign(Object.assign({}, base), { opt: true });
     }
     return base;
 }
@@ -301,24 +270,13 @@ function makeEnumFieldInfo(field, resolver) {
         T: enumType,
     };
     if (field.repeated) {
-        return {
-            ...base,
-            repeated: true,
-            packed: field.packed,
-            oneof: undefined,
-        };
+        return Object.assign(Object.assign({}, base), { repeated: true, packed: field.packed, oneof: undefined });
     }
     if (field.oneof) {
-        return {
-            ...base,
-            oneof: field.oneof.name,
-        };
+        return Object.assign(Object.assign({}, base), { oneof: field.oneof.name });
     }
     if (field.optional) {
-        return {
-            ...base,
-            opt: true,
-        };
+        return Object.assign(Object.assign({}, base), { opt: true });
     }
     return base;
 }