ts-proto 1.178.0 → 1.180.0

package/README.markdown

@@ -551,6 +551,8 @@ Generated code will be placed in the Gradle build directory.
 
 - With `--ts_proto_opt=comments=false`, comments won't be copied from the proto files to the generated code.
 
+- With `--ts_proto_opt=bigIntLiteral=false`, the generated code will use `BigInt("0")` instead of `0n` for BigInt literals. BigInt literals aren't supported by TypeScript when the "target" compiler option set to something older than "ES2020".
+
 - With `--ts_proto_opt=useNullAsOptional=true`, `undefined` values will be converted to `null`, and if you use `optional` label in your `.proto` file, the field will have `undefined` type as well. for example:
 
 ```protobuf
@@ -603,7 +605,7 @@ export interface User {
 }
 ```
 
-- With `--ts_proto_opt=noDefaultsForOptionals=true`, `undefined` primitive values will not be defaulted as per the protobuf spec. Additionally unlike the standard behavior, when a field is set to it's standard default value, it *will* be encoded allowing it to be sent over the wire and distinguished from undefined values. For example if a message does not set a boolean value, ordinarily this would be defaulted to `false` which is different to it being undefined. 
+- With `--ts_proto_opt=noDefaultsForOptionals=true`, `undefined` primitive values will not be defaulted as per the protobuf spec. Additionally unlike the standard behavior, when a field is set to it's standard default value, it *will* be encoded allowing it to be sent over the wire and distinguished from undefined values. For example if a message does not set a boolean value, ordinarily this would be defaulted to `false` which is different to it being undefined.
 
 This option allows the library to act in a compatible way with the [Wire implementation](https://square.github.io/wire/) maintained and used by Square/Block. Note: this option should only be used in combination with other client/server code generated using Wire or ts-proto with this option enabled.
 
@@ -752,7 +754,7 @@ ts-protoc --ts_proto_out=./output -I=./protos ./protoc/*.proto
 # Todo
 
 - Support the string-based encoding of duration in `fromJSON`/`toJSON`
-- Make `oneof=unions` the default behavior in 2.0
+- Make `oneof=unions-value` the default behavior in 2.0
 - Probably change `forceLong` default in 2.0, should default to `forceLong=long`
 - Make `esModuleInterop=true` the default in 2.0
 
@@ -770,11 +772,11 @@ Will generate a `Foo` type with two fields: `field_a: string | undefined;` and `
 
 With this output, you'll have to check both `if object.field_a` and `if object.field_b`, and if you set one, you'll have to remember to unset the other.
 
-Instead, we recommend using the `oneof=unions` option, which will change the output to be an Abstract Data Type/ADT like:
+Instead, we recommend using the `oneof=unions-value` option, which will change the output to be an Abstract Data Type/ADT like:
 
 ```typescript
 interface YourMessage {
-  eitherField?: { $case: "field_a"; field_a: string } | { $case: "field_b"; field_b: string };
+  eitherField?: { $case: "field_a"; value: string } | { $case: "field_b"; value: string };
 }
 ```
 
@@ -782,11 +784,21 @@ As this will automatically enforce only one of `field_a` or `field_b` "being set
 
 (Note that `eitherField` is optional b/c `oneof` in Protobuf means "at most one field" is set, and does not mean one of the fields _must_ be set.)
 
-In ts-proto's currently-unscheduled 2.x release, `oneof=unions` will become the default behavior.
+In ts-proto's currently-unscheduled 2.x release, `oneof=unions-value` will become the default behavior.
+
+There is also a `oneof=unions` option, which generates a union where the field names are included in each option:
+
+```typescript
+interface YourMessage {
+  eitherField?: { $case: "field_a"; field_a: string } | { $case: "field_b"; field_b: string };
+}
+```
+
+This is no longer recommended as it can be difficult to write code and types to handle multiple oneof options:
 
 ## OneOf Type Helpers
 
-The following helper types may make it easier to work with the types generated from `oneof=unions`:
+The following helper types may make it easier to work with the types generated from `oneof=unions`, though they are generally not needed if you use `oneof=unions-value`:
 
 ```ts
 /** Extracts all the case names from a oneOf field. */
@@ -797,19 +809,45 @@ type OneOfValues<T> = T extends { $case: infer U extends string; [key: string]:
 
 /** Extracts the specific type of a oneOf case based on its field name */
 type OneOfCase<T, K extends OneOfCases<T>> = T extends {
+  $case: K;
+  [key: string]: unknown;
+}
+  ? T
+  : never;
+
+/** Extracts the specific type of a value type from a oneOf field */
+type OneOfValue<T, K extends OneOfCases<T>> = T extends {
   $case: infer U extends K;
   [key: string]: unknown;
 }
   ? T[U]
   : never;
+```
 
-/** Extracts the specific type of a value type from a oneOf field */
-export type OneOfValue<T, K extends OneOfCases<T>> = T extends {
+For comparison, the equivalents for `oneof=unions-value`:
+
+```ts
+/** Extracts all the case names from a oneOf field. */
+type OneOfCases<T> = T['$case'];
+
+/** Extracts a union of all the value types from a oneOf field */
+type OneOfValues<T> = T['value'];
+
+/** Extracts the specific type of a oneOf case based on its field name */
+type OneOfCase<T, K extends OneOfCases<T>> = T extends {
   $case: K;
   [key: string]: unknown;
 }
   ? T
   : never;
+
+/** Extracts the specific type of a value type from a oneOf field */
+type OneOfValue<T, K extends OneOfCases<T>> = T extends {
+  $case: infer U extends K;
+  value: unknown;
+}
+  ? T[U]
+  : never;
 ```
 
 # Default values and unset fields

package/build/enums.js

@@ -7,11 +7,10 @@ const case_1 = require("./case");
 const sourceInfo_1 = require("./sourceInfo");
 // Output the `enum { Foo, A = 0, B = 1 }`
 function generateEnum(ctx, fullName, enumDesc, sourceInfo) {
-    var _a;
     const { options } = ctx;
     const chunks = [];
     let unrecognizedEnum = { present: false };
-    (0, utils_1.maybeAddComment)(options, sourceInfo, chunks, (_a = enumDesc.options) === null || _a === void 0 ? void 0 : _a.deprecated);
+    (0, utils_1.maybeAddComment)(options, sourceInfo, chunks, enumDesc.options?.deprecated);
     if (options.enumsAsLiterals) {
         chunks.push((0, ts_poet_1.code) `export const ${(0, ts_poet_1.def)(fullName)} = {`);
     }
@@ -20,14 +19,13 @@ function generateEnum(ctx, fullName, enumDesc, sourceInfo) {
     }
     const delimiter = options.enumsAsLiterals ? ":" : "=";
     enumDesc.value.forEach((valueDesc, index) => {
-        var _a;
         const info = sourceInfo.lookup(sourceInfo_1.Fields.enum.value, index);
         const valueName = getValueName(ctx, fullName, valueDesc);
         const memberName = getMemberName(ctx, enumDesc, valueDesc);
         if (valueDesc.number === options.unrecognizedEnumValue) {
             unrecognizedEnum = { present: true, name: memberName };
         }
-        (0, utils_1.maybeAddComment)(options, info, chunks, (_a = valueDesc.options) === null || _a === void 0 ? void 0 : _a.deprecated, `${memberName} - `);
+        (0, utils_1.maybeAddComment)(options, info, chunks, valueDesc.options?.deprecated, `${memberName} - `);
         chunks.push((0, ts_poet_1.code) `${memberName} ${delimiter} ${options.stringEnums ? `"${valueName}"` : valueDesc.number.toString()},`);
     });
     if (options.unrecognizedEnum && !unrecognizedEnum.present) {

package/build/generate-generic-service-definition.js

@@ -11,9 +11,8 @@ const utils_1 = require("./utils");
  * Generates a framework-agnostic service descriptor.
  */
 function generateGenericServiceDefinition(ctx, fileDesc, sourceInfo, serviceDesc) {
-    var _a, _b, _c;
     const chunks = [];
-    (0, utils_1.maybeAddComment)(ctx.options, sourceInfo, chunks, (_a = serviceDesc.options) === null || _a === void 0 ? void 0 : _a.deprecated);
+    (0, utils_1.maybeAddComment)(ctx.options, sourceInfo, chunks, serviceDesc.options?.deprecated);
     // Service definition type
     const name = (0, ts_poet_1.def)(`${serviceDesc.name}Definition`);
     chunks.push((0, ts_poet_1.code) `
@@ -23,7 +22,7 @@ function generateGenericServiceDefinition(ctx, fileDesc, sourceInfo, serviceDesc
     chunks.push((0, ts_poet_1.code) `
     export const ${name} = {
   `);
-    (_b = serviceDesc.options) === null || _b === void 0 ? void 0 : _b.uninterpretedOption;
+    serviceDesc.options?.uninterpretedOption;
     chunks.push((0, ts_poet_1.code) `
       name: '${serviceDesc.name}',
       fullName: '${(0, utils_1.maybePrefixPackage)(fileDesc, serviceDesc.name)}',
@@ -31,7 +30,7 @@ function generateGenericServiceDefinition(ctx, fileDesc, sourceInfo, serviceDesc
   `);
     for (const [index, methodDesc] of serviceDesc.method.entries()) {
         const info = sourceInfo.lookup(sourceInfo_1.Fields.service.method, index);
-        (0, utils_1.maybeAddComment)(ctx.options, info, chunks, (_c = methodDesc.options) === null || _c === void 0 ? void 0 : _c.deprecated);
+        (0, utils_1.maybeAddComment)(ctx.options, info, chunks, methodDesc.options?.deprecated);
         chunks.push((0, ts_poet_1.code) `
       ${(0, case_1.uncapitalize)(methodDesc.name)}: ${generateMethodDefinition(ctx, methodDesc)},
     `);

package/build/generate-grpc-js.js

@@ -39,9 +39,8 @@ function generateGrpcJsService(ctx, fileDesc, sourceInfo, serviceDesc) {
 }
 exports.generateGrpcJsService = generateGrpcJsService;
 function generateServiceDefinition(ctx, fileDesc, sourceInfo, serviceDesc) {
-    var _a, _b;
     const chunks = [];
-    (0, utils_1.maybeAddComment)(ctx.options, sourceInfo, chunks, (_a = serviceDesc.options) === null || _a === void 0 ? void 0 : _a.deprecated);
+    (0, utils_1.maybeAddComment)(ctx.options, sourceInfo, chunks, serviceDesc.options?.deprecated);
     // Service definition type
     const name = (0, ts_poet_1.def)(`${serviceDesc.name}Service`);
     chunks.push((0, ts_poet_1.code) `
@@ -56,7 +55,7 @@ function generateServiceDefinition(ctx, fileDesc, sourceInfo, serviceDesc) {
         const inputType = (0, types_1.messageToTypeName)(ctx, methodDesc.inputType);
         const outputType = (0, types_1.messageToTypeName)(ctx, methodDesc.outputType);
         const info = sourceInfo.lookup(sourceInfo_1.Fields.service.method, index);
-        (0, utils_1.maybeAddComment)(ctx.options, info, chunks, (_b = methodDesc.options) === null || _b === void 0 ? void 0 : _b.deprecated);
+        (0, utils_1.maybeAddComment)(ctx.options, info, chunks, methodDesc.options?.deprecated);
         const inputEncoder = (0, encode_1.generateEncoder)(ctx, methodDesc.inputType);
         const outputEncoder = (0, encode_1.generateEncoder)(ctx, methodDesc.outputType);
         const inputDecoder = (0, encode_1.generateDecoder)(ctx, methodDesc.inputType);
@@ -79,7 +78,6 @@ function generateServiceDefinition(ctx, fileDesc, sourceInfo, serviceDesc) {
     return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });
 }
 function generateServerStub(ctx, sourceInfo, serviceDesc) {
-    var _a;
     const chunks = [];
     chunks.push((0, ts_poet_1.code) `export interface ${(0, ts_poet_1.def)(`${serviceDesc.name}Server`)} extends ${UntypedServiceImplementation} {`);
     for (const [index, methodDesc] of serviceDesc.method.entries()) {
@@ -87,7 +85,7 @@ function generateServerStub(ctx, sourceInfo, serviceDesc) {
         const inputType = (0, types_1.messageToTypeName)(ctx, methodDesc.inputType);
         const outputType = (0, types_1.messageToTypeName)(ctx, methodDesc.outputType);
         const info = sourceInfo.lookup(sourceInfo_1.Fields.service.method, index);
-        (0, utils_1.maybeAddComment)(ctx.options, info, chunks, (_a = methodDesc.options) === null || _a === void 0 ? void 0 : _a.deprecated);
+        (0, utils_1.maybeAddComment)(ctx.options, info, chunks, methodDesc.options?.deprecated);
         const callType = methodDesc.clientStreaming
             ? methodDesc.serverStreaming
                 ? handleBidiStreamingCall
@@ -103,7 +101,6 @@ function generateServerStub(ctx, sourceInfo, serviceDesc) {
     return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });
 }
 function generateClientStub(ctx, sourceInfo, serviceDesc) {
-    var _a;
     const chunks = [];
     chunks.push((0, ts_poet_1.code) `export interface ${(0, ts_poet_1.def)(`${serviceDesc.name}Client`)} extends ${Client} {`);
     for (const [index, methodDesc] of serviceDesc.method.entries()) {
@@ -111,7 +108,7 @@ function generateClientStub(ctx, sourceInfo, serviceDesc) {
         const inputType = (0, types_1.messageToTypeName)(ctx, methodDesc.inputType);
         const outputType = (0, types_1.messageToTypeName)(ctx, methodDesc.outputType);
         const info = sourceInfo.lookup(sourceInfo_1.Fields.service.method, index);
-        (0, utils_1.maybeAddComment)(ctx.options, info, chunks, (_a = methodDesc.options) === null || _a === void 0 ? void 0 : _a.deprecated);
+        (0, utils_1.maybeAddComment)(ctx.options, info, chunks, methodDesc.options?.deprecated);
         const responseCallback = (0, ts_poet_1.code) `(error: ${ServiceError} | null, response: ${outputType}) => void`;
         if (methodDesc.clientStreaming) {
             if (methodDesc.serverStreaming) {

package/build/generate-nestjs.js

@@ -7,20 +7,18 @@ const sourceInfo_1 = require("./sourceInfo");
 const main_1 = require("./main");
 const utils_1 = require("./utils");
 function generateNestjsServiceController(ctx, fileDesc, sourceInfo, serviceDesc) {
-    var _a;
     const { options } = ctx;
     const chunks = [];
     const Metadata = (0, ts_poet_1.imp)("Metadata@@grpc/grpc-js");
-    (0, utils_1.maybeAddComment)(options, sourceInfo, chunks, (_a = serviceDesc.options) === null || _a === void 0 ? void 0 : _a.deprecated);
+    (0, utils_1.maybeAddComment)(options, sourceInfo, chunks, serviceDesc.options?.deprecated);
     const t = options.context ? `<${main_1.contextTypeVar}>` : "";
     chunks.push((0, ts_poet_1.code) `
     export interface ${serviceDesc.name}Controller${t} {
   `);
     serviceDesc.method.forEach((methodDesc, index) => {
-        var _a;
         (0, utils_1.assertInstanceOf)(methodDesc, utils_1.FormattedMethodDescriptor);
         const info = sourceInfo.lookup(sourceInfo_1.Fields.service.method, index);
-        (0, utils_1.maybeAddComment)(options, info, chunks, (_a = serviceDesc.options) === null || _a === void 0 ? void 0 : _a.deprecated);
+        (0, utils_1.maybeAddComment)(options, info, chunks, serviceDesc.options?.deprecated);
         const params = [];
         if (options.context) {
             params.push((0, ts_poet_1.code) `ctx: Context`);
@@ -80,7 +78,6 @@ function generateNestjsServiceClient(ctx, fileDesc, sourceInfo, serviceDesc) {
     export interface ${serviceDesc.name}Client${t} {
   `);
     serviceDesc.method.forEach((methodDesc, index) => {
-        var _a;
         (0, utils_1.assertInstanceOf)(methodDesc, utils_1.FormattedMethodDescriptor);
         const params = [];
         if (options.context) {
@@ -98,7 +95,7 @@ function generateNestjsServiceClient(ctx, fileDesc, sourceInfo, serviceDesc) {
         // Return observable since nestjs client always returns an Observable
         const returns = (0, types_1.responseObservable)(ctx, methodDesc);
         const info = sourceInfo.lookup(sourceInfo_1.Fields.service.method, index);
-        (0, utils_1.maybeAddComment)(options, info, chunks, (_a = methodDesc.options) === null || _a === void 0 ? void 0 : _a.deprecated);
+        (0, utils_1.maybeAddComment)(options, info, chunks, methodDesc.options?.deprecated);
         chunks.push((0, ts_poet_1.code) `
       ${methodDesc.formattedName}(
         ${(0, ts_poet_1.joinCode)(params, { on: "," })}

package/build/generate-nice-grpc.js

@@ -19,7 +19,6 @@ function generateNiceGrpcService(ctx, fileDesc, sourceInfo, serviceDesc) {
 }
 exports.generateNiceGrpcService = generateNiceGrpcService;
 function generateServerStub(ctx, sourceInfo, serviceDesc) {
-    var _a;
     const chunks = [];
     const maybeSuffix = serviceDesc.name.endsWith("Service") ? "" : "Service";
     chunks.push((0, ts_poet_1.code) `export interface ${(0, ts_poet_1.def)(`${serviceDesc.name}${maybeSuffix}Implementation`)}<CallContextExt = {}> {`);
@@ -32,7 +31,7 @@ function generateServerStub(ctx, sourceInfo, serviceDesc) {
         }
         const ServerStreamingMethodResult = ctx.utils.NiceGrpcServerStreamingMethodResult;
         const info = sourceInfo.lookup(sourceInfo_1.Fields.service.method, index);
-        (0, utils_1.maybeAddComment)(ctx.options, info, chunks, (_a = methodDesc.options) === null || _a === void 0 ? void 0 : _a.deprecated);
+        (0, utils_1.maybeAddComment)(ctx.options, info, chunks, methodDesc.options?.deprecated);
         if (methodDesc.clientStreaming) {
             if (methodDesc.serverStreaming) {
                 // bidi streaming
@@ -78,7 +77,6 @@ function generateServerStub(ctx, sourceInfo, serviceDesc) {
     return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });
 }
 function generateClientStub(ctx, sourceInfo, serviceDesc) {
-    var _a;
     const chunks = [];
     chunks.push((0, ts_poet_1.code) `export interface ${(0, ts_poet_1.def)(`${serviceDesc.name}Client`)}<CallOptionsExt = {}> {`);
     for (const [index, methodDesc] of serviceDesc.method.entries()) {
@@ -89,7 +87,7 @@ function generateClientStub(ctx, sourceInfo, serviceDesc) {
         }
         const outputType = (0, types_1.messageToTypeName)(ctx, methodDesc.outputType, { keepValueType: true });
         const info = sourceInfo.lookup(sourceInfo_1.Fields.service.method, index);
-        (0, utils_1.maybeAddComment)(ctx.options, info, chunks, (_a = methodDesc.options) === null || _a === void 0 ? void 0 : _a.deprecated);
+        (0, utils_1.maybeAddComment)(ctx.options, info, chunks, methodDesc.options?.deprecated);
         if (methodDesc.clientStreaming) {
             if (methodDesc.serverStreaming) {
                 // bidi streaming

package/build/generate-services.js

@@ -17,17 +17,15 @@ const main_1 = require("./main");
  * vs. server-side code/interfaces are handled separately.
  */
 function generateService(ctx, fileDesc, sourceInfo, serviceDesc) {
-    var _a;
     const { options } = ctx;
     const chunks = [];
-    (0, utils_1.maybeAddComment)(options, sourceInfo, chunks, (_a = serviceDesc.options) === null || _a === void 0 ? void 0 : _a.deprecated);
+    (0, utils_1.maybeAddComment)(options, sourceInfo, chunks, serviceDesc.options?.deprecated);
     const maybeTypeVar = options.context ? `<${main_1.contextTypeVar}>` : "";
     chunks.push((0, ts_poet_1.code) `export interface ${(0, ts_poet_1.def)(serviceDesc.name)}${maybeTypeVar} {`);
     serviceDesc.method.forEach((methodDesc, index) => {
-        var _a;
         (0, utils_1.assertInstanceOf)(methodDesc, utils_1.FormattedMethodDescriptor);
         const info = sourceInfo.lookup(sourceInfo_1.Fields.service.method, index);
-        (0, utils_1.maybeAddComment)(options, info, chunks, (_a = methodDesc.options) === null || _a === void 0 ? void 0 : _a.deprecated);
+        (0, utils_1.maybeAddComment)(options, info, chunks, methodDesc.options?.deprecated);
         const params = [];
         if (options.context) {
             params.push((0, ts_poet_1.code) `ctx: Context`);

package/build/generate-struct-wrappers.js

@@ -193,6 +193,27 @@ function generateWrapShallow(ctx, fullProtoTypeName, fieldNames) {
           throw new ${ctx.utils.globalThis}.Error('Unsupported any value type: ' + typeof value);
         }
         return result;
+    }`);
+        }
+        else if (ctx.options.oneof === options_1.OneofOption.UNIONS_VALUE) {
+            chunks.push((0, ts_poet_1.code) `wrap(value: any): Value {
+        const result = createBaseValue()${maybeAsAny(ctx.options)};
+        if (value === null) {
+          result.kind = {$case: '${fieldNames.nullValue}', value };
+        } else if (typeof value === 'boolean') {
+          result.kind = {$case: '${fieldNames.boolValue}', value };
+        } else if (typeof value === 'number') {
+          result.kind = {$case: '${fieldNames.numberValue}', value };
+        } else if (typeof value === 'string') {
+          result.kind = {$case: '${fieldNames.stringValue}', value };
+        } else if (${ctx.utils.globalThis}.Array.isArray(value)) {
+          result.kind = {$case: '${fieldNames.listValue}', value };
+        } else if (typeof value === 'object') {
+          result.kind = {$case: '${fieldNames.structValue}', value };
+        } else if (typeof value !== 'undefined') {
+          throw new ${ctx.utils.globalThis}.Error('Unsupported any value type: ' + typeof value);
+        }
+        return result;
     }`);
         }
         else {
@@ -284,6 +305,11 @@ function generateUnwrapShallow(ctx, fullProtoTypeName, fieldNames) {
         } else {
           return undefined;
         }
+      }`);
+        }
+        else if (ctx.options.oneof === options_1.OneofOption.UNIONS_VALUE) {
+            chunks.push((0, ts_poet_1.code) `unwrap(message: Value): string | number | boolean | Object | null | Array<any> | undefined {
+        return message.kind?.value;
       }`);
         }
         else {

package/build/main.js

@@ -21,7 +21,6 @@ const types_1 = require("./types");
 const utils_1 = require("./utils");
 const visit_1 = require("./visit");
 function generateFile(ctx, fileDesc) {
-    var _a;
     const { options, utils } = ctx;
     if (options.useOptionals === false) {
         console.warn("ts-proto: Passing useOptionals as a boolean option is deprecated and will be removed in a future version. Please pass the string 'none' instead of false.");
@@ -52,7 +51,7 @@ function generateFile(ctx, fileDesc) {
     // Syntax, unlike most fields, is not repeated and thus does not use an index
     const sourceInfo = sourceInfo_1.default.fromDescriptor(fileDesc);
     const headerComment = sourceInfo.lookup(sourceInfo_1.Fields.file.syntax, undefined);
-    (0, utils_1.maybeAddComment)(options, headerComment, chunks, (_a = fileDesc.options) === null || _a === void 0 ? void 0 : _a.deprecated);
+    (0, utils_1.maybeAddComment)(options, headerComment, chunks, fileDesc.options?.deprecated);
     // Apply formatting to methods here, so they propagate globally
     for (let svc of fileDesc.service) {
         for (let i = 0; i < svc.method.length; i++) {
@@ -449,6 +448,12 @@ function makeDeepPartial(options, longs) {
       ? { [K in keyof Omit<T, '$case'>]?: DeepPartial<T[K]> } & { ${maybeReadonly(options)}$case: T['$case'] }
     `;
     }
+    else if (options.oneof === options_1.OneofOption.UNIONS_VALUE) {
+        oneofCase = `
+      : T extends { ${maybeReadonly(options)}$case: string; value: unknown; }
+      ? { ${maybeReadonly(options)}$case: T['$case']; value?: DeepPartial<T['value']>; }
+    `;
+    }
     const maybeExport = options.exportCommonSymbols ? "export" : "";
     // Allow passing longs as numbers or strings, nad we'll convert them
     const maybeLong = options.forceLong === options_1.LongOption.LONG ? (0, ts_poet_1.code) ` : T extends ${longs.Long} ? string | number | Long ` : "";
@@ -673,10 +678,9 @@ function makeAssertionUtils(bytes) {
 }
 // Create the interface with properties
 function generateInterfaceDeclaration(ctx, fullName, messageDesc, sourceInfo, fullTypeName) {
-    var _a;
     const { options, currentFile } = ctx;
     const chunks = [];
-    (0, utils_1.maybeAddComment)(options, sourceInfo, chunks, (_a = messageDesc.options) === null || _a === void 0 ? void 0 : _a.deprecated);
+    (0, utils_1.maybeAddComment)(options, sourceInfo, chunks, messageDesc.options?.deprecated);
     // interface name should be defined to avoid import collisions
     chunks.push((0, ts_poet_1.code) `export interface ${(0, ts_poet_1.def)(fullName)} {`);
     if ((0, options_1.addTypeToMessages)(options)) {
@@ -685,7 +689,6 @@ function generateInterfaceDeclaration(ctx, fullName, messageDesc, sourceInfo, fu
     // When oneof=unions, we generate a single property with an ADT per `oneof` clause.
     const processedOneofs = new Set();
     messageDesc.field.forEach((fieldDesc, index) => {
-        var _a;
         if ((0, types_1.isWithinOneOfThatShouldBeUnion)(options, fieldDesc)) {
             const { oneofIndex } = fieldDesc;
             if (!processedOneofs.has(oneofIndex)) {
@@ -695,7 +698,7 @@ function generateInterfaceDeclaration(ctx, fullName, messageDesc, sourceInfo, fu
             return;
         }
         const info = sourceInfo.lookup(sourceInfo_1.Fields.message.field, index);
-        (0, utils_1.maybeAddComment)(options, info, chunks, (_a = fieldDesc.options) === null || _a === void 0 ? void 0 : _a.deprecated);
+        (0, utils_1.maybeAddComment)(options, info, chunks, fieldDesc.options?.deprecated);
         const fieldKey = (0, utils_1.safeAccessor)((0, utils_1.getFieldName)(fieldDesc, options));
         const isOptional = (0, types_1.isOptionalProperty)(fieldDesc, messageDesc.options, options, currentFile.isProto3Syntax);
         const type = (0, types_1.toTypeName)(ctx, messageDesc, fieldDesc, isOptional);
@@ -714,7 +717,8 @@ function generateOneofProperty(ctx, messageDesc, oneofIndex, sourceInfo) {
     const unionType = (0, ts_poet_1.joinCode)(fields.map((f) => {
         let fieldName = (0, case_1.maybeSnakeToCamel)(f.name, options);
         let typeName = (0, types_1.toTypeName)(ctx, messageDesc, f);
-        return (0, ts_poet_1.code) `{ ${mbReadonly}$case: '${fieldName}', ${mbReadonly}${fieldName}: ${typeName} }`;
+        let valueName = (0, utils_1.oneofValueName)(fieldName, options);
+        return (0, ts_poet_1.code) `{ ${mbReadonly}$case: '${fieldName}', ${mbReadonly}${valueName}: ${typeName} }`;
     }), { on: " | " });
     const name = (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[oneofIndex].name, options);
     return (0, ts_poet_1.code) `${mbReadonly}${name}?: ${unionType} | ${(0, utils_1.nullOrUndefined)(options)},`;
@@ -982,9 +986,10 @@ function generateDecode(ctx, fullName, messageDesc) {
             const oneofNameWithMessage = options.useJsonName
                 ? messageProperty
                 : (0, utils_1.getPropertyAccessor)("message", (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[field.oneofIndex].name, options));
+            const valueName = (0, utils_1.oneofValueName)(fieldName, options);
             chunks.push((0, ts_poet_1.code) `
         ${tagCheck}
-        ${oneofNameWithMessage} = { $case: '${fieldName}', ${fieldName}: ${readSnippet} };
+        ${oneofNameWithMessage} = { $case: '${fieldName}', ${valueName}: ${readSnippet} };
       `);
         }
         else {
@@ -1054,13 +1059,13 @@ function getEncodeWriteSnippet(ctx, field) {
             case "int64":
             case "sint64":
             case "sfixed64":
-                return (place, placeAlt) => (0, ts_poet_1.code) `if (BigInt.asIntN(64, ${place}) !== ${placeAlt !== null && placeAlt !== void 0 ? placeAlt : place}) {
+                return (place, placeAlt) => (0, ts_poet_1.code) `if (BigInt.asIntN(64, ${place}) !== ${placeAlt ?? place}) {
           throw new ${utils.globalThis}.Error('value provided for field ${place} of type ${fieldType} too large');
         }
         writer.uint32(${tag}).${(0, types_1.toReaderCall)(field)}(${place}.toString())`;
             case "uint64":
             case "fixed64":
-                return (place, placeAlt) => (0, ts_poet_1.code) `if (BigInt.asUintN(64, ${place}) !== ${placeAlt !== null && placeAlt !== void 0 ? placeAlt : place}) {
+                return (place, placeAlt) => (0, ts_poet_1.code) `if (BigInt.asUintN(64, ${place}) !== ${placeAlt ?? place}) {
           throw new ${utils.globalThis}.Error('value provided for field ${place} of type ${fieldType} too large');
         }
         writer.uint32(${tag}).${(0, types_1.toReaderCall)(field)}(${place}.toString())`;
@@ -1270,8 +1275,9 @@ function generateEncode(ctx, fullName, messageDesc) {
                 for (const oneOfField of oneOfFieldsDict[field.oneofIndex]) {
                     const writeSnippet = getEncodeWriteSnippet(ctx, oneOfField);
                     const oneOfFieldName = (0, case_1.maybeSnakeToCamel)(oneOfField.name, ctx.options);
+                    const valueName = (0, utils_1.oneofValueName)(oneOfFieldName, ctx.options);
                     chunks.push((0, ts_poet_1.code) `case "${oneOfFieldName}":
-            ${writeSnippet(`${oneofNameWithMessage}.${oneOfFieldName}`)};
+            ${writeSnippet(`${oneofNameWithMessage}.${valueName}`)};
             break;`);
                 }
                 chunks.push((0, ts_poet_1.code) `}`);
@@ -1385,11 +1391,10 @@ function generateGetExtension(ctx, fullName) {
   `;
 }
 function generateExtension(ctx, message, extension) {
-    var _a;
     const type = (0, types_1.toTypeName)(ctx, message, extension);
     const packedTag = (0, types_1.isRepeated)(extension) && (0, types_1.packedType)(extension.type) !== undefined ? ((extension.number << 3) | 2) >>> 0 : undefined;
     const singularTag = ((extension.number << 3) | (0, types_1.basicWireType)(extension.type)) >>> 0;
-    const tag = packedTag !== null && packedTag !== void 0 ? packedTag : singularTag;
+    const tag = packedTag ?? singularTag;
     const chunks = [];
     chunks.push((0, ts_poet_1.code) `{`);
     chunks.push((0, ts_poet_1.code) `number: ${extension.number},`);
@@ -1397,7 +1402,7 @@ function generateExtension(ctx, message, extension) {
     if (packedTag !== undefined)
         chunks.push((0, ts_poet_1.code) `singularTag: ${singularTag},`);
     chunks.push((0, ts_poet_1.code) `repeated: ${extension.label == ts_proto_descriptors_1.FieldDescriptorProto_Label.LABEL_REPEATED},`);
-    chunks.push((0, ts_poet_1.code) `packed: ${((_a = extension.options) === null || _a === void 0 ? void 0 : _a.packed) ? true : false},`);
+    chunks.push((0, ts_poet_1.code) `packed: ${extension.options?.packed ? true : false},`);
     const Reader = (0, utils_1.impFile)(ctx.options, "Reader@protobufjs/minimal");
     const Writer = (0, utils_1.impFile)(ctx.options, "Writer@protobufjs/minimal");
     if (ctx.options.outputEncodeMethods === true ||
@@ -1479,7 +1484,7 @@ function generateExtension(ctx, message, extension) {
         }
         else if ((0, types_1.isScalar)(extension) || (0, types_1.isEnum)(extension)) {
             chunks.push((0, ts_poet_1.code) `
-        if (${(0, types_1.notDefaultCheck)(ctx, extension, message === null || message === void 0 ? void 0 : message.options, "value")}) {
+        if (${(0, types_1.notDefaultCheck)(ctx, extension, message?.options, "value")}) {
           const writer = ${Writer}.create();
           ${writeSnippet("value")};
           encoded.push(writer.finish());
@@ -1578,7 +1583,6 @@ function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
     };
     // add a check for each incoming field
     messageDesc.field.forEach((field) => {
-        var _a;
         const fieldName = (0, utils_1.getFieldName)(field, options);
         const fieldKey = (0, utils_1.safeAccessor)(fieldName);
         const jsonName = (0, utils_1.getFieldJsonName)(field, options);
@@ -1586,7 +1590,6 @@ function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
         const jsonPropertyOptional = (0, utils_1.getPropertyAccessor)("object", jsonName, true);
         // get code that extracts value from incoming object
         const readSnippet = (from) => {
-            var _a;
             if ((0, types_1.isEnum)(field)) {
                 const fromJson = (0, types_1.getEnumMethod)(ctx, field.typeName, "FromJSON");
                 return (0, ts_poet_1.code) `${fromJson}(${from})`;
@@ -1602,7 +1605,7 @@ function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
                     }
                 }
                 else if ((0, types_1.isLong)(field) && (0, types_1.isJsTypeFieldOption)(options, field)) {
-                    const fieldType = (_a = (0, types_1.getFieldOptionsJsType)(field, ctx.options)) !== null && _a !== void 0 ? _a : field.type;
+                    const fieldType = (0, types_1.getFieldOptionsJsType)(field, ctx.options) ?? field.type;
                     const cstr = (0, case_1.capitalize)((0, types_1.basicTypeName)(ctx, { ...field, type: fieldType }, { keepValueType: true }).toCodeString([]));
                     return (0, ts_poet_1.code) `${utils.globalThis}.${cstr}(${from})`;
                 }
@@ -1715,7 +1718,7 @@ function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
         const noDefaultValue = !options.initializeFieldsAsUndefined &&
             (0, types_1.isOptionalProperty)(field, messageDesc.options, options, currentFile.isProto3Syntax);
         // and then use the snippet to handle repeated fields if necessary
-        if ((_a = canonicalFromJson[fullTypeName]) === null || _a === void 0 ? void 0 : _a[fieldName]) {
+        if (canonicalFromJson[fullTypeName]?.[fieldName]) {
             chunks.push((0, ts_poet_1.code) `${fieldName}: ${canonicalFromJson[fullTypeName][fieldName]("object")},`);
         }
         else if ((0, types_1.isRepeated)(field)) {
@@ -1767,8 +1770,9 @@ function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
                 const fieldName = (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[field.oneofIndex].name, options);
                 chunks.push((0, ts_poet_1.code) `${fieldName}: `);
             }
+            const valueName = (0, utils_1.oneofValueName)(fieldKey, options);
             const ternaryIf = (0, ts_poet_1.code) `${ctx.utils.isSet}(${jsonProperty})`;
-            const ternaryThen = (0, ts_poet_1.code) `{ $case: '${fieldName}', ${fieldKey}: ${readSnippet(`${jsonProperty}`)}`;
+            const ternaryThen = (0, ts_poet_1.code) `{ $case: '${fieldName}', ${valueName}: ${readSnippet(`${jsonProperty}`)}`;
             chunks.push((0, ts_poet_1.code) `${ternaryIf} ? ${ternaryThen}} : `);
             if (field === lastCase) {
                 chunks.push((0, ts_poet_1.code) `${(0, utils_1.nullOrUndefined)(options)},`);
@@ -1838,7 +1842,6 @@ function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
         const jsonProperty = (0, utils_1.getPropertyAccessor)("obj", jsonName);
         const messageProperty = (0, utils_1.getPropertyAccessor)("message", fieldName);
         const readSnippet = (from) => {
-            var _a;
             if ((0, types_1.isEnum)(field)) {
                 const toJson = (0, types_1.getEnumMethod)(ctx, field.typeName, "ToJSON");
                 return (0, ts_poet_1.code) `${toJson}(${from})`;
@@ -1917,7 +1920,7 @@ function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
                 return (0, ts_poet_1.code) `${utils.base64FromBytes}(${from})`;
             }
             else if ((0, types_1.isLong)(field) && (0, types_1.isJsTypeFieldOption)(options, field)) {
-                const fieldType = (_a = (0, types_1.getFieldOptionsJsType)(field, ctx.options)) !== null && _a !== void 0 ? _a : field.type;
+                const fieldType = (0, types_1.getFieldOptionsJsType)(field, ctx.options) ?? field.type;
                 if (!fieldType) {
                     return (0, ts_poet_1.code) `${from}`;
                 }
@@ -1979,9 +1982,10 @@ function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
             const oneofNameWithMessage = options.useJsonName
                 ? messageProperty
                 : (0, utils_1.getPropertyAccessor)("message", (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[field.oneofIndex].name, options));
+            const valueName = (0, utils_1.oneofValueName)(fieldName, options);
             chunks.push((0, ts_poet_1.code) `
         if (${oneofNameWithMessage}?.$case === '${fieldName}') {
-          ${jsonProperty} = ${readSnippet(`${oneofNameWithMessage}.${fieldName}`)};
+          ${jsonProperty} = ${readSnippet(`${oneofNameWithMessage}.${valueName}`)};
         }
       `);
         }
@@ -2155,14 +2159,15 @@ function generateFromPartial(ctx, fullName, messageDesc) {
             const oneofName = (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[field.oneofIndex].name, options);
             const oneofNameWithMessage = (0, utils_1.getPropertyAccessor)("message", oneofName);
             const oneofNameWithObject = (0, utils_1.getPropertyAccessor)("object", oneofName);
-            const v = readSnippet(`${oneofNameWithObject}.${fieldName}`);
+            const valueName = (0, utils_1.oneofValueName)(fieldName, options);
+            const v = readSnippet(`${oneofNameWithObject}.${valueName}`);
             chunks.push((0, ts_poet_1.code) `
         if (
           ${oneofNameWithObject}?.$case === '${fieldName}'
-          && ${oneofNameWithObject}?.${fieldName} !== undefined
-          && ${oneofNameWithObject}?.${fieldName} !== null
+          && ${oneofNameWithObject}?.${valueName} !== undefined
+          && ${oneofNameWithObject}?.${valueName} !== null
         ) {
-          ${oneofNameWithMessage} = { $case: '${fieldName}', ${fieldName}: ${v} };
+          ${oneofNameWithMessage} = { $case: '${fieldName}', ${valueName}: ${v} };
         }
       `);
         }

package/build/options.d.ts

@@ -22,7 +22,8 @@ export declare enum EnvOption {
 }
 export declare enum OneofOption {
     PROPERTIES = "properties",
-    UNIONS = "unions"
+    UNIONS = "unions",
+    UNIONS_VALUE = "unions-value"
 }
 export declare enum ServiceOption {
     GRPC = "grpc-js",
@@ -97,6 +98,7 @@ export type Options = {
     useNullAsOptional: boolean;
     annotateFilesWithVersion: boolean;
     noDefaultsForOptionals: boolean;
+    bigIntLiteral: boolean;
 };
 export declare function defaultOptions(): Options;
 export declare function optionsFromParameter(parameter: string | undefined): Options;

package/build/options.js

@@ -30,6 +30,7 @@ var OneofOption;
 (function (OneofOption) {
     OneofOption["PROPERTIES"] = "properties";
     OneofOption["UNIONS"] = "unions";
+    OneofOption["UNIONS_VALUE"] = "unions-value";
 })(OneofOption || (exports.OneofOption = OneofOption = {}));
 var ServiceOption;
 (function (ServiceOption) {
@@ -104,6 +105,7 @@ function defaultOptions() {
         useNullAsOptional: false,
         annotateFilesWithVersion: true,
         noDefaultsForOptionals: false,
+        bigIntLiteral: true,
     };
 }
 exports.defaultOptions = defaultOptions;

package/build/schema.js

@@ -10,7 +10,6 @@ const minimal_1 = require("protobufjs/minimal");
 const fileDescriptorProto = (0, ts_poet_1.imp)("FileDescriptorProto@ts-proto-descriptors");
 const extensionCache = {};
 function generateSchema(ctx, fileDesc, sourceInfo) {
-    var _a;
     const { options } = ctx;
     const chunks = [];
     fileDesc.extension.forEach((extension) => {
@@ -73,7 +72,7 @@ function generateSchema(ctx, fileDesc, sourceInfo) {
     const descriptor = ts_proto_descriptors_1.FileDescriptorProto.fromPartial(fileDesc);
     // Only keep locations that include comments
     descriptor.sourceCodeInfo = {
-        location: ((_a = descriptor.sourceCodeInfo) === null || _a === void 0 ? void 0 : _a.location.filter((loc) => loc["leadingComments"] || loc["trailingComments"])) || [],
+        location: descriptor.sourceCodeInfo?.location.filter((loc) => loc["leadingComments"] || loc["trailingComments"]) || [],
     };
     let fileOptions;
     if (fileDesc.options) {

package/build/types.js

@@ -61,9 +61,8 @@ function basicLongWireType(type) {
 exports.basicLongWireType = basicLongWireType;
 /** Returns the type name without any repeated/required/etc. labels. */
 function basicTypeName(ctx, field, typeOptions = {}) {
-    var _a, _b;
     const { options } = ctx;
-    const fieldType = (_a = getFieldOptionsJsType(field, ctx.options)) !== null && _a !== void 0 ? _a : field.type;
+    const fieldType = getFieldOptionsJsType(field, ctx.options) ?? field.type;
     switch (fieldType) {
         case ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_DOUBLE:
         case ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_FLOAT:
@@ -79,7 +78,7 @@ function basicTypeName(ctx, field, typeOptions = {}) {
         case ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_FIXED64:
         case ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_SFIXED64:
             return isJsTypeFieldOption(options, field)
-                ? (_b = jsTypeName(field)) !== null && _b !== void 0 ? _b : longTypeName(ctx)
+                ? jsTypeName(field) ?? longTypeName(ctx)
                 : // this handles 2^53, Long is only needed for 2^64; this is effectively pbjs's forceNumber
                     longTypeName(ctx);
         case ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_BOOL:
@@ -170,8 +169,7 @@ function packedType(type) {
 }
 exports.packedType = packedType;
 function getFieldOptionsJsType(field, options) {
-    var _a;
-    if (!options.useJsTypeOverride || ((_a = field.options) === null || _a === void 0 ? void 0 : _a.jstype) === undefined) {
+    if (!options.useJsTypeOverride || field.options?.jstype === undefined) {
         return;
     }
     switch (field.options.jstype) {
@@ -242,7 +240,7 @@ function defaultValue(ctx, field) {
                 return `"${numericDefaultVal}"`;
             }
             else if (options.forceLong === options_1.LongOption.BIGINT) {
-                return `BigInt("${numericDefaultVal}")`;
+                return options.bigIntLiteral ? (0, ts_poet_1.code) `${numericDefaultVal}n` : (0, ts_poet_1.code) `BigInt("${numericDefaultVal}")`;
             }
             else {
                 return numericDefaultVal;
@@ -375,12 +373,12 @@ function isOptionalProperty(field, messageOptions, options, isProto3Syntax) {
     const optionalAll = options.useOptionals === "all";
     const deprecatedOnly = options.useOptionals === "deprecatedOnly" && field.options && field.options.deprecated;
     return ((optionalMessages && isMessage(field) && !isRepeated(field)) ||
-        ((optionalAll || deprecatedOnly) && !(messageOptions === null || messageOptions === void 0 ? void 0 : messageOptions.mapEntry)) ||
+        ((optionalAll || deprecatedOnly) && !messageOptions?.mapEntry) ||
         (options.noDefaultsForOptionals && !isRepeated(field) && (isScalar(field) || isEnum(field))) ||
         // file is proto2, we have enabled proto2 optionals, and the field itself is optional
         (!isProto3Syntax &&
             field.label === ts_proto_descriptors_1.FieldDescriptorProto_Label.LABEL_OPTIONAL &&
-            !(messageOptions === null || messageOptions === void 0 ? void 0 : messageOptions.mapEntry) &&
+            !messageOptions?.mapEntry &&
             !options.disableProto2Optionals) ||
         // don't bother verifying that oneof is not union. union oneofs generate their own properties.
         isWithinOneOf(field) ||
@@ -409,7 +407,9 @@ function isWithinOneOf(field) {
 }
 exports.isWithinOneOf = isWithinOneOf;
 function isWithinOneOfThatShouldBeUnion(options, field) {
-    return isWithinOneOf(field) && options.oneof === options_1.OneofOption.UNIONS && !field.proto3Optional;
+    return (isWithinOneOf(field) &&
+        (options.oneof === options_1.OneofOption.UNIONS || options.oneof === options_1.OneofOption.UNIONS_VALUE) &&
+        !field.proto3Optional);
 }
 exports.isWithinOneOfThatShouldBeUnion = isWithinOneOfThatShouldBeUnion;
 function isRepeated(field) {
@@ -573,17 +573,15 @@ function longTypeName(ctx) {
     }
 }
 function jsTypeName(field) {
-    var _a, _b;
-    if (((_a = field.options) === null || _a === void 0 ? void 0 : _a.jstype) === ts_proto_descriptors_1.FieldOptions_JSType.JS_STRING) {
+    if (field.options?.jstype === ts_proto_descriptors_1.FieldOptions_JSType.JS_STRING) {
         return (0, ts_poet_1.code) `string`;
     }
-    else if (((_b = field.options) === null || _b === void 0 ? void 0 : _b.jstype) === ts_proto_descriptors_1.FieldOptions_JSType.JS_NUMBER) {
+    else if (field.options?.jstype === ts_proto_descriptors_1.FieldOptions_JSType.JS_NUMBER) {
         return (0, ts_poet_1.code) `number`;
     }
 }
 /** Maps `.some_proto_namespace.Message` to a TypeName. */
 function messageToTypeName(ctx, protoType, typeOptions = {}) {
-    var _a;
     const { options, typeMap } = ctx;
     // Watch for the wrapper types `.google.protobuf.*Value`. If we're mapping
     // them to basic built-in types, we union the type with undefined to
@@ -591,7 +589,7 @@ function messageToTypeName(ctx, protoType, typeOptions = {}) {
     // - If the field is repeated, values cannot be undefined.
     let valueType = valueTypeName(ctx, protoType);
     if (!typeOptions.keepValueType && valueType) {
-        if ((_a = typeOptions.repeated) !== null && _a !== void 0 ? _a : false) {
+        if (typeOptions.repeated ?? false) {
             return valueType;
         }
         return (0, ts_poet_1.code) `${valueType} | ${(0, utils_1.nullOrUndefined)(options)}`;
@@ -624,14 +622,13 @@ function getEnumMethod(ctx, enumProtoType, methodSuffix) {
 exports.getEnumMethod = getEnumMethod;
 /** Return the TypeName for any field (primitive/message/etc.) as exposed in the interface. */
 function toTypeName(ctx, messageDesc, field, ensureOptional = false) {
-    var _a;
     function finalize(type, isOptional) {
         if (isOptional) {
             return (0, ts_poet_1.code) `${type} | ${(0, utils_1.nullOrUndefined)(ctx.options, field.proto3Optional)}`;
         }
         return type;
     }
-    const fieldType = (_a = getFieldOptionsJsType(field, ctx.options)) !== null && _a !== void 0 ? _a : field.type;
+    const fieldType = getFieldOptionsJsType(field, ctx.options) ?? field.type;
     const type = basicTypeName(ctx, { ...field, type: fieldType }, { keepValueType: false });
     if (isRepeated(field)) {
         const mapType = messageDesc ? detectMapType(ctx, messageDesc, field) : false;
@@ -697,12 +694,11 @@ function shouldGenerateJSMapType(ctx, message, field) {
 }
 exports.shouldGenerateJSMapType = shouldGenerateJSMapType;
 function detectMapType(ctx, messageDesc, fieldDesc) {
-    var _a;
     const { typeMap } = ctx;
     if (fieldDesc.label === ts_proto_descriptors_1.FieldDescriptorProto_Label.LABEL_REPEATED &&
         fieldDesc.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_MESSAGE) {
         const mapType = typeMap.get(fieldDesc.typeName)[2];
-        if (!((_a = mapType.options) === null || _a === void 0 ? void 0 : _a.mapEntry))
+        if (!mapType.options?.mapEntry)
             return undefined;
         const [keyField, valueField] = mapType.field;
         const keyType = toTypeName(ctx, messageDesc, keyField);
@@ -799,8 +795,7 @@ function hasSingleRepeatedField(messageDesc) {
     return messageDesc.field.length == 1 && messageDesc.field[0].label === ts_proto_descriptors_1.FieldDescriptorProto_Label.LABEL_REPEATED;
 }
 function isJsTypeFieldOption(options, field) {
-    var _a, _b;
     return (options.useJsTypeOverride &&
-        (((_a = field.options) === null || _a === void 0 ? void 0 : _a.jstype) === ts_proto_descriptors_1.FieldOptions_JSType.JS_NUMBER || ((_b = field.options) === null || _b === void 0 ? void 0 : _b.jstype) === ts_proto_descriptors_1.FieldOptions_JSType.JS_STRING));
+        (field.options?.jstype === ts_proto_descriptors_1.FieldOptions_JSType.JS_NUMBER || field.options?.jstype === ts_proto_descriptors_1.FieldOptions_JSType.JS_STRING));
 }
 exports.isJsTypeFieldOption = isJsTypeFieldOption;

package/build/utils.d.ts

@@ -73,6 +73,7 @@ export declare function arrowFunction(params: string, body: Code | string, isOne
 export declare function nullOrUndefined(options: Pick<Options, "useNullAsOptional">, hasProto3Optional?: boolean): string;
 export declare function maybeCheckIsNotNull(options: Pick<Options, "useNullAsOptional">, typeName: string, prefix?: string): string;
 export declare function maybeCheckIsNull(options: Pick<Options, "useNullAsOptional">, typeName: string, prefix?: string): string;
+export declare function oneofValueName(fieldName: string, options: Pick<Options, "oneof">): string;
 export declare function withOrMaybeCheckIsNotNull(options: Pick<Options, "useNullAsOptional">, typeName: string): string;
 export declare function withOrMaybeCheckIsNull(options: Pick<Options, "useNullAsOptional">, typeName: string): string;
 export declare function withAndMaybeCheckIsNotNull(options: Pick<Options, "useNullAsOptional">, typeName: string): string;

package/build/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVersions = exports.withAndMaybeCheckIsNull = exports.withAndMaybeCheckIsNotNull = exports.withOrMaybeCheckIsNull = exports.withOrMaybeCheckIsNotNull = exports.maybeCheckIsNull = exports.maybeCheckIsNotNull = exports.nullOrUndefined = exports.arrowFunction = exports.tryCatchBlock = exports.impProto = exports.impFile = exports.getPropertyAccessor = exports.safeAccessor = exports.getFieldName = exports.getFieldJsonName = exports.FormattedMethodDescriptor = exports.assertInstanceOf = exports.maybePrefixPackage = exports.maybeAddComment = exports.upperFirst = exports.lowerFirst = exports.singular = exports.fail = exports.readToBuffer = exports.generateIndexFiles = exports.protoFilesToGenerate = void 0;
+exports.getVersions = exports.withAndMaybeCheckIsNull = exports.withAndMaybeCheckIsNotNull = exports.withOrMaybeCheckIsNull = exports.withOrMaybeCheckIsNotNull = exports.oneofValueName = exports.maybeCheckIsNull = exports.maybeCheckIsNotNull = exports.nullOrUndefined = exports.arrowFunction = exports.tryCatchBlock = exports.impProto = exports.impFile = exports.getPropertyAccessor = exports.safeAccessor = exports.getFieldName = exports.getFieldJsonName = exports.FormattedMethodDescriptor = exports.assertInstanceOf = exports.maybePrefixPackage = exports.maybeAddComment = exports.upperFirst = exports.lowerFirst = exports.singular = exports.fail = exports.readToBuffer = exports.generateIndexFiles = exports.protoFilesToGenerate = void 0;
 const path = require("path");
 const ts_poet_1 = require("ts-poet");
 const options_1 = require("./options");
@@ -266,6 +266,10 @@ function maybeCheckIsNull(options, typeName, prefix) {
     return options.useNullAsOptional ? ` ${prefix} ${typeName} === null` : "";
 }
 exports.maybeCheckIsNull = maybeCheckIsNull;
+function oneofValueName(fieldName, options) {
+    return options.oneof === options_1.OneofOption.UNIONS ? fieldName : "value";
+}
+exports.oneofValueName = oneofValueName;
 function withOrMaybeCheckIsNotNull(options, typeName) {
     return maybeCheckIsNotNull(options, typeName, "||");
 }
@@ -283,7 +287,6 @@ function withAndMaybeCheckIsNull(options, typeName) {
 }
 exports.withAndMaybeCheckIsNull = withAndMaybeCheckIsNull;
 async function getVersions(request) {
-    var _a;
     let protocVersion = "unknown";
     if (request.compilerVersion) {
         const { major, minor, patch } = request.compilerVersion;
@@ -291,7 +294,7 @@ async function getVersions(request) {
     }
     const path = "../package.json";
     const packageJson = await Promise.resolve(`${path}`).then(s => require(s));
-    const tsProtoVersion = `v${(_a = packageJson === null || packageJson === void 0 ? void 0 : packageJson.version) !== null && _a !== void 0 ? _a : "unknown"}`;
+    const tsProtoVersion = `v${packageJson?.version ?? "unknown"}`;
     return {
         protocVersion,
         tsProtoVersion,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-proto",
-  "version": "1.178.0",
+  "version": "1.180.0",
   "description": "",
   "main": "build/plugin.js",
   "repository": "github:stephenh/ts-proto",