@bufbuild/protobuf 0.0.6 → 0.0.9

package/dist/cjs/legacy-type-registry.js

@@ -0,0 +1,104 @@
+"use strict";
+// Copyright 2021-2022 Buf Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TypeRegistry = void 0;
+/**
+ * @deprecated use createRegistry() instead
+ *
+ * TypeRegistry is a simple registry for all message, enum, or service types.
+ */
+class TypeRegistry {
+    constructor() {
+        this.messages = {};
+        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) {
+            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) {
+            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;
+        }
+    }
+}
+exports.TypeRegistry = TypeRegistry;

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/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

@@ -31,36 +31,31 @@ exports.getEnumType = getEnumType;
 /**
  * Sets reflection information on a generated enum.
  */
-function setEnumType(enumObject, typeName, values
-// We do not surface options at this time
-// opt?: {
-// options?: { readonly [extensionName: string]: JsonValue };
-// },
-) {
+function setEnumType(enumObject, typeName, values, opt) {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
-    enumObject[enumTypeSymbol] = makeEnumType(typeName, values);
+    enumObject[enumTypeSymbol] = makeEnumType(typeName, values.map((v) => ({
+        no: v.no,
+        name: v.name,
+        localName: enumObject[v.no],
+    })), opt);
 }
 exports.setEnumType = setEnumType;
-// We do not surface options at this time
-// export type PartialEnumValue = Omit<EnumValueInfo, 'options'> & Partial<Pick<EnumValueInfo, "options">>;
 /**
  * Create a new EnumType with the given values.
  */
-function makeEnumType(typeName, values
-// We do not surface options at this time
-// opt?: {
-// options?: { readonly [extensionName: string]: JsonValue };
-// },
-) {
+function makeEnumType(typeName, values, 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+_opt) {
     const names = Object.create(null);
     const numbers = Object.create(null);
     const normalValues = [];
     for (const value of values) {
         // We do not surface options at this time
         // const value: EnumValueInfo = {...v, options: v.options ?? emptyReadonlyObject};
-        normalValues.push(value);
-        names[value.name] = value;
-        numbers[value.no] = value;
+        const n = normalizeEnumValue(value);
+        normalValues.push(n);
+        names[value.name] = n;
+        numbers[value.no] = n;
     }
     return {
         typeName,
@@ -78,26 +73,22 @@ function makeEnumType(typeName, values
 exports.makeEnumType = makeEnumType;
 /**
  * Create a new enum object with the given values.
+ * Sets reflection information.
  */
 function makeEnum(typeName, values, opt) {
     const enumObject = {};
     for (const value of values) {
-        const name = makeEnumValueName(value, opt?.sharedPrefix);
-        enumObject[name] = value.no;
-        enumObject[value.no] = name;
+        const n = normalizeEnumValue(value);
+        enumObject[n.localName] = n.no;
+        enumObject[n.no] = n.localName;
     }
-    setEnumType(enumObject, typeName, values);
+    setEnumType(enumObject, typeName, values, opt);
     return enumObject;
 }
 exports.makeEnum = makeEnum;
-// Construct a local name for an enum value.
-// This logic matches the Go function with the same name in private/protoplugin/names.go
-function makeEnumValueName(value, sharedPrefix) {
-    if (sharedPrefix === undefined) {
-        return value.name;
+function normalizeEnumValue(value) {
+    if ("localName" in value) {
+        return value;
     }
-    if (!value.name.startsWith(sharedPrefix)) {
-        return value.name;
-    }
-    return value.name.substring(sharedPrefix.length);
+    return Object.assign(Object.assign({}, value), { localName: value.name });
 }

package/dist/cjs/private/field-wrapper.js

@@ -13,7 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unwrapField = exports.wrapField = void 0;
+exports.getUnwrappedFieldType = exports.unwrapField = exports.wrapField = void 0;
+const field_js_1 = require("../field.js");
 /**
  * Wrap field values whose message type has a wrapper.
  */
@@ -34,3 +35,31 @@ function unwrapField(type, value) {
     return type.fieldWrapper ? type.fieldWrapper.unwrapField(value) : value;
 }
 exports.unwrapField = unwrapField;
+/**
+ * If the given field uses one of the well-known wrapper types, return
+ * the base type it wraps.
+ */
+function getUnwrappedFieldType(field) {
+    if (field.kind !== "message_field") {
+        return undefined;
+    }
+    if (field.repeated) {
+        return undefined;
+    }
+    if (field.oneof != undefined) {
+        return undefined;
+    }
+    return wktWrapperToScalarType[field.message.typeName];
+}
+exports.getUnwrappedFieldType = getUnwrappedFieldType;
+const wktWrapperToScalarType = {
+    "google.protobuf.DoubleValue": field_js_1.ScalarType.DOUBLE,
+    "google.protobuf.FloatValue": field_js_1.ScalarType.FLOAT,
+    "google.protobuf.Int64Value": field_js_1.ScalarType.INT64,
+    "google.protobuf.UInt64Value": field_js_1.ScalarType.UINT64,
+    "google.protobuf.Int32Value": field_js_1.ScalarType.INT32,
+    "google.protobuf.UInt32Value": field_js_1.ScalarType.UINT32,
+    "google.protobuf.BoolValue": field_js_1.ScalarType.BOOL,
+    "google.protobuf.StringValue": field_js_1.ScalarType.STRING,
+    "google.protobuf.BytesValue": field_js_1.ScalarType.BYTES,
+};

package/dist/cjs/private/field.js

@@ -25,7 +25,7 @@ class InternalOneofInfo {
         this.default = undefined;
         this.fields = [];
         this.name = name;
-        this.localName = (0, names_js_1.makeOneofName)(name);
+        this.localName = (0, names_js_1.localOneofName)(name);
     }
     addField(field) {
         (0, assert_js_1.assert)(field.oneof === this, `field ${field.name} not one of ${this.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/private/names.js

@@ -13,44 +13,119 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeMethodName = exports.makeOneofName = exports.makeFieldName = exports.makeJsonName = void 0;
+exports.findEnumSharedPrefix = exports.fieldJsonName = exports.localOneofName = exports.localFieldName = exports.localName = void 0;
 /**
- * Returns the JSON name for a protobuf field, exactly like protoc does.
+ * Returns the name of a protobuf element in generated code.
+ *
+ * Field names - including oneofs - are converted to lowerCamelCase. For
+ * messages, enumerations and services, the package name is stripped from
+ * the type name. For nested messages and enumerations, the names are joined
+ * with an underscore. For methods, the first character is made lowercase.
  */
-function makeJsonName(protoName) {
-    return protoCamelCase(protoName);
+function localName(desc) {
+    switch (desc.kind) {
+        case "enum_field":
+        case "message_field":
+        case "map_field":
+        case "scalar_field":
+            return localFieldName(desc.name, desc.oneof !== undefined);
+        case "oneof":
+            return localOneofName(desc.name);
+        case "enum":
+        case "message":
+        case "service": {
+            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;
+        }
+        case "enum_value": {
+            const sharedPrefix = desc.parent.sharedPrefix;
+            if (sharedPrefix === undefined) {
+                return desc.name;
+            }
+            const name = desc.name.substring(sharedPrefix.length);
+            if (reservedObjectProperties[name]) {
+                return name + "$";
+            }
+            return name;
+        }
+        case "rpc": {
+            let name = desc.name;
+            if (name.length == 0) {
+                return name;
+            }
+            name = name[0].toLowerCase() + name.substring(1);
+            if (reservedObjectProperties[name]) {
+                return name + "$";
+            }
+            return name;
+        }
+    }
 }
-exports.makeJsonName = makeJsonName;
+exports.localName = localName;
 /**
- * Returns the local name of a field, exactly like protoc-gen-es does.
+ * Returns the name of a field in generated code.
  */
-function makeFieldName(protoName, inOneof) {
-    const n = protoCamelCase(protoName);
+function localFieldName(protoName, inOneof) {
+    let name = protoCamelCase(protoName);
     if (inOneof) {
-        return n;
+        // oneof member names are not properties, but values of the `case` property.
+        return name;
     }
-    return rProp[n] ? n + escapeChar : n;
+    if (reservedObjectProperties[name] || reservedMessageProperties[name]) {
+        name = name + "$";
+    }
+    return name;
 }
-exports.makeFieldName = makeFieldName;
+exports.localFieldName = localFieldName;
 /**
- * Returns the local name of a oneof group, exactly like protoc-gen-es does.
+ * Returns the name of a oneof group in generated code.
  */
-function makeOneofName(protoName) {
-    return makeFieldName(protoName, false);
+function localOneofName(protoName) {
+    return localFieldName(protoName, false);
 }
-exports.makeOneofName = makeOneofName;
+exports.localOneofName = localOneofName;
 /**
- * Returns the local name of a rpc, exactly like protoc-gen-es does.
+ * Returns the JSON name for a protobuf field, exactly like protoc does.
  */
-function makeMethodName(protoName) {
-    if (protoName.length == 0) {
-        return protoName;
+exports.fieldJsonName = protoCamelCase;
+/**
+ * Finds a prefix shared by enum values, for example `MY_ENUM_` for
+ * `enum MyEnum {MY_ENUM_A=0; MY_ENUM_B=1;}`.
+ */
+function findEnumSharedPrefix(enumName, valueNames) {
+    const prefix = camelToSnakeCase(enumName) + "_";
+    for (const name of valueNames) {
+        if (!name.toLowerCase().startsWith(prefix)) {
+            return undefined;
+        }
+        const shortName = name.substring(prefix.length);
+        if (shortName.length == 0) {
+            return undefined;
+        }
+        if (/^\d/.test(shortName)) {
+            // identifiers must not start with numbers
+            return undefined;
+        }
     }
-    return protoName[0].toLowerCase() + protoName.substring(1);
+    return prefix;
+}
+exports.findEnumSharedPrefix = findEnumSharedPrefix;
+/**
+ * Converts lowerCamelCase or UpperCamelCase into lower_snake_case.
+ * This is used to find shared prefixes in an enum.
+ */
+function camelToSnakeCase(camel) {
+    return (camel.substring(0, 1) + camel.substring(1).replace(/[A-Z]/g, (c) => "_" + c)).toLowerCase();
 }
-exports.makeMethodName = makeMethodName;
-// Converts snake_case to protoCamelCase according to the convention
-// used by protoc to convert a field name to a JSON name.
+/**
+ * Converts snake_case to protoCamelCase according to the convention
+ * used by protoc to convert a field name to a JSON name.
+ */
 function protoCamelCase(snakeCase) {
     let capNext = false;
     const b = [];
@@ -84,17 +159,81 @@ function protoCamelCase(snakeCase) {
     }
     return b.join("");
 }
-// escapeChar must be appended to a reserved name.
-// We choose '$' because it is invalid in proto identifiers.
-const escapeChar = "$";
-// Names that cannot be used for object properties.
-// See buf_es/protoc-gen-es/internal/protoplugin/names.go
-const rProp = {
+// Names that cannot be used for identifiers, such as class names,
+// but _can_ be used for object properties.
+const reservedIdent = {
+    // 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,
+    // ECMAScript 2015 future reserved keywords
+    enum: true,
+    implements: true,
+    interface: true,
+    let: true,
+    package: true,
+    private: true,
+    protected: true,
+    public: true,
+    static: true,
+    // Class name cannot be 'Object' when targeting ES5 with module CommonJS
+    Object: true,
+    // TypeScript keywords that cannot be used for types (as opposed to variables)
+    bigint: true,
+    number: true,
+    boolean: true,
+    string: true,
+    object: true,
+    // 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 = {
     // 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 = {
     // names reserved by the runtime
     getType: true,
     clone: true,

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,21 +53,21 @@ 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"
         ? 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.localName = (0, names_js_1.localFieldName)(field.name, field.oneof !== undefined);
+        f.jsonName = (_a = field.jsonName) !== null && _a !== void 0 ? _a : (0, names_js_1.fieldJsonName)(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) {