ts-proto 1.137.2 → 1.139.0

package/README.markdown

@@ -167,6 +167,10 @@ Along with `encode`/`decode` factory methods:
 
 ```typescript
 export const Simple = {
+  create(baseObject?: DeepPartial<Simple>): Simple {
+    ...
+  },
+
   encode(message: Simple, writer: Writer = Writer.create()): Writer {
     ...
   },
@@ -332,7 +336,7 @@ Generated code will be placed in the Gradle build directory.
 
   So, between typo-prevention, reader inconsistency, and proper initialization, ts-proto recommends using `useOptionals=none` as the "most safe" option.
 
-  All that said, this approach does require writers/creators to set every field (although `fromPartial` is meant to address this), so if you still want to have optional fields, you can set `useOptionals=messages` or `useOptionals=all`.
+  All that said, this approach does require writers/creators to set every field (although `fromPartial` and `create` are meant to address this), so if you still want to have optional fields, you can set `useOptionals=messages` or `useOptionals=all`.
 
   (See [this issue](https://github.com/stephenh/ts-proto/issues/120#issuecomment-678375833) and [this issue](https://github.com/stephenh/ts-proto/issues/397#issuecomment-977259118) for discussions on `useOptional`.)
 
@@ -368,7 +372,7 @@ Generated code will be placed in the Gradle build directory.
 
   This is also useful if you want "only types".
 
-- With `--ts_proto_opt=outputPartialMethods=false`, the `Message.fromPartial` methods for accepting partially-formed objects/object literals will not be output.
+- With `--ts_proto_opt=outputPartialMethods=false`, the `Message.fromPartial` and `Message.create` methods for accepting partially-formed objects/object literals will not be output.
 
 - With `--ts_proto_opt=stringEnums=true`, the generated enum types will be string-based instead of int-based.
 
@@ -433,9 +437,9 @@ Generated code will be placed in the Gradle build directory.
 
 - With `--ts_proto_opt=enumsAsLiterals=true`, the generated enum types will be enum-ish object with `as const`.
 
-- With `--ts_proto_opt=useExactTypes=false`, the generated `fromPartial` method will not use Exact types.
+- With `--ts_proto_opt=useExactTypes=false`, the generated `fromPartial` and `create` methods will not use Exact types.
 
-  The default behavior is `useExactTypes=true`, which makes `fromPartial` use Exact type for its argument to make TypeScript reject any unknown properties.
+  The default behavior is `useExactTypes=true`, which makes `fromPartial` and `create` use Exact type for its argument to make TypeScript reject any unknown properties.
 
 - With `--ts_proto_opt=unknownFields=true`, all unknown fields will be parsed and output as arrays of buffers.
 

package/build/generate-struct-wrappers.js

@@ -0,0 +1,318 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateUnwrapShallow = exports.generateWrapShallow = exports.generateUnwrapDeep = exports.generateWrapDeep = exports.isWrapperType = void 0;
+const ts_poet_1 = require("ts-poet");
+const types_1 = require("./types");
+const options_1 = require("./options");
+/** Whether we need to generate `.wrap` and `.unwrap` methods for the given type. */
+function isWrapperType(fullProtoTypeName) {
+    return ((0, types_1.isStructTypeName)(fullProtoTypeName) ||
+        (0, types_1.isAnyValueTypeName)(fullProtoTypeName) ||
+        (0, types_1.isListValueTypeName)(fullProtoTypeName) ||
+        (0, types_1.isFieldMaskTypeName)(fullProtoTypeName));
+}
+exports.isWrapperType = isWrapperType;
+/**
+ * Converts ts-proto's idiomatic Struct/Value/ListValue representation to the proto messages.
+ *
+ * We do this deeply b/c NestJS does not invoke wrappers recursively.
+ */
+function generateWrapDeep(ctx, fullProtoTypeName, fieldNames) {
+    const chunks = [];
+    if ((0, types_1.isStructTypeName)(fullProtoTypeName)) {
+        let setStatement = "struct.fields[key] = Value.wrap(object[key]);";
+        if (ctx.options.useMapType) {
+            setStatement = "struct.fields.set(key, Value.wrap(object[key]));";
+        }
+        chunks.push((0, ts_poet_1.code) `wrap(object: {[key: string]: any} | undefined): Struct {
+      const struct = createBaseStruct();
+      if (object !== undefined) {
+        Object.keys(object).forEach(key => {
+          ${setStatement}
+        });
+      }
+      return struct;
+    }`);
+    }
+    if ((0, types_1.isAnyValueTypeName)(fullProtoTypeName)) {
+        // Turn ts-proto representation --> proto representation
+        chunks.push((0, ts_poet_1.code) `wrap(value: any): Value {
+      const result = {} as any;
+      if (value === null) {
+        result.${fieldNames.nullValue} = NullValue.NULL_VALUE;
+      } else if (typeof value === 'boolean') {
+        result.${fieldNames.boolValue} = value;
+      } else if (typeof value === 'number') {
+        result.${fieldNames.numberValue} = value;
+      } else if (typeof value === 'string') {
+        result.${fieldNames.stringValue} = value;
+      } else if (Array.isArray(value)) {
+        result.${fieldNames.listValue} = ListValue.wrap(value);
+      } else if (typeof value === 'object') {
+        result.${fieldNames.structValue} = Struct.wrap(value);
+      } else if (typeof value !== 'undefined') {
+        throw new Error('Unsupported any value type: ' + typeof value);
+      }
+      return result;
+    }`);
+    }
+    if ((0, types_1.isListValueTypeName)(fullProtoTypeName)) {
+        const maybeReadyOnly = ctx.options.useReadonlyTypes ? "Readonly" : "";
+        chunks.push((0, ts_poet_1.code) `wrap(array: ${maybeReadyOnly}Array<any> | undefined): ListValue {
+      const result = createBaseListValue()${maybeAsAny(ctx.options)};
+      result.values = (array ?? []).map(Value.wrap);
+      return result;
+    }`);
+    }
+    if ((0, types_1.isFieldMaskTypeName)(fullProtoTypeName)) {
+        chunks.push((0, ts_poet_1.code) `wrap(paths: ${maybeReadonly(ctx.options)} string[]): FieldMask {
+      const result = createBaseFieldMask()${maybeAsAny(ctx.options)};
+      result.paths = paths;
+      return result;
+    }`);
+    }
+    return chunks;
+}
+exports.generateWrapDeep = generateWrapDeep;
+/**
+ * Converts proto's Struct/Value?listValue messages to ts-proto's idiomatic representation.
+ *
+ * We do this deeply b/c NestJS does not invoke wrappers recursively.
+ */
+function generateUnwrapDeep(ctx, fullProtoTypeName, fieldNames) {
+    const chunks = [];
+    if ((0, types_1.isStructTypeName)(fullProtoTypeName)) {
+        if (ctx.options.useMapType) {
+            chunks.push((0, ts_poet_1.code) `unwrap(message: Struct): {[key: string]: any} {
+        const object: { [key: string]: any } = {};
+        [...message.fields.keys()].forEach((key) => {
+          object[key] = Value.unwrap(message.fields.get(key));
+        });
+        return object;
+      }`);
+        }
+        else {
+            chunks.push((0, ts_poet_1.code) `unwrap(message: Struct): {[key: string]: any} {
+        const object: { [key: string]: any } = {};
+        if (message.fields) {
+          Object.keys(message.fields).forEach(key => {
+            object[key] = Value.unwrap(message.fields[key]);
+          });
+        }
+        return object;
+      }`);
+        }
+    }
+    if ((0, types_1.isAnyValueTypeName)(fullProtoTypeName)) {
+        // We check hasOwnProperty because the incoming `message` has been serde-ing
+        // by the NestJS/protobufjs runtime, and so has a base class with default values
+        // that throw off the simpler checks we do in generateUnwrapShallow
+        chunks.push((0, ts_poet_1.code) `unwrap(message: any): string | number | boolean | Object | null | Array<any> | undefined {
+      if (message?.hasOwnProperty('${fieldNames.stringValue}') && message.${fieldNames.stringValue} !== undefined) {
+        return message.${fieldNames.stringValue};
+      } else if (message?.hasOwnProperty('${fieldNames.numberValue}') && message?.${fieldNames.numberValue} !== undefined) {
+        return message.${fieldNames.numberValue};
+      } else if (message?.hasOwnProperty('${fieldNames.boolValue}') && message?.${fieldNames.boolValue} !== undefined) {
+        return message.${fieldNames.boolValue};
+      } else if (message?.hasOwnProperty('${fieldNames.structValue}') && message?.${fieldNames.structValue} !== undefined) {
+        return Struct.unwrap(message.${fieldNames.structValue} as any);
+      } else if (message?.hasOwnProperty('${fieldNames.listValue}') && message?.${fieldNames.listValue} !== undefined) {
+        return ListValue.unwrap(message.${fieldNames.listValue});
+      } else if (message?.hasOwnProperty('${fieldNames.nullValue}') && message?.${fieldNames.nullValue} !== undefined) {
+        return null;
+      }
+      return undefined;
+    }`);
+    }
+    if ((0, types_1.isListValueTypeName)(fullProtoTypeName)) {
+        chunks.push((0, ts_poet_1.code) `unwrap(message: ${ctx.options.useReadonlyTypes ? "any" : "ListValue"}): Array<any> {
+      if (message?.hasOwnProperty('values') && Array.isArray(message.values)) {
+        return message.values.map(Value.unwrap);
+      } else {
+        return message as any;
+      }
+    }`);
+    }
+    if ((0, types_1.isFieldMaskTypeName)(fullProtoTypeName)) {
+        chunks.push((0, ts_poet_1.code) `unwrap(message: ${ctx.options.useReadonlyTypes ? "any" : "FieldMask"}): string[] {
+      return message.paths;
+    }`);
+    }
+    return chunks;
+}
+exports.generateUnwrapDeep = generateUnwrapDeep;
+/**
+ * Converts ts-proto's idiomatic Struct/Value/ListValue representation to the proto messages.
+ *
+ * We do this shallow's b/c ts-proto's encode methods handle the recursion.
+ */
+function generateWrapShallow(ctx, fullProtoTypeName, fieldNames) {
+    const chunks = [];
+    if ((0, types_1.isStructTypeName)(fullProtoTypeName)) {
+        let setStatement = "struct.fields[key] = object[key];";
+        if (ctx.options.useMapType) {
+            setStatement = "struct.fields.set(key, object[key]);";
+        }
+        chunks.push((0, ts_poet_1.code) `wrap(object: {[key: string]: any} | undefined): Struct {
+      const struct = createBaseStruct();
+      if (object !== undefined) {
+        Object.keys(object).forEach(key => {
+          ${setStatement}
+        });
+      }
+      return struct;
+    }`);
+    }
+    if ((0, types_1.isAnyValueTypeName)(fullProtoTypeName)) {
+        if (ctx.options.oneof === options_1.OneofOption.UNIONS) {
+            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}', ${fieldNames.nullValue}: NullValue.NULL_VALUE};
+        } else if (typeof value === 'boolean') {
+          result.kind = {$case: '${fieldNames.boolValue}', ${fieldNames.boolValue}: value};
+        } else if (typeof value === 'number') {
+          result.kind = {$case: '${fieldNames.numberValue}', ${fieldNames.numberValue}: value};
+        } else if (typeof value === 'string') {
+          result.kind = {$case: '${fieldNames.stringValue}', ${fieldNames.stringValue}: value};
+        } else if (Array.isArray(value)) {
+          result.kind = {$case: '${fieldNames.listValue}', ${fieldNames.listValue}: value};
+        } else if (typeof value === 'object') {
+          result.kind = {$case: '${fieldNames.structValue}', ${fieldNames.structValue}: value};
+        } else if (typeof value !== 'undefined') {
+          throw new Error('Unsupported any value type: ' + typeof value);
+        }
+        return result;
+    }`);
+        }
+        else {
+            chunks.push((0, ts_poet_1.code) `wrap(value: any): Value {
+        const result = createBaseValue()${maybeAsAny(ctx.options)};
+        if (value === null) {
+          result.${fieldNames.nullValue} = NullValue.NULL_VALUE;
+        } else if (typeof value === 'boolean') {
+          result.${fieldNames.boolValue} = value;
+        } else if (typeof value === 'number') {
+          result.${fieldNames.numberValue} = value;
+        } else if (typeof value === 'string') {
+          result.${fieldNames.stringValue} = value;
+        } else if (Array.isArray(value)) {
+          result.${fieldNames.listValue} = value;
+        } else if (typeof value === 'object') {
+          result.${fieldNames.structValue} = value;
+        } else if (typeof value !== 'undefined') {
+          throw new Error('Unsupported any value type: ' + typeof value);
+        }
+        return result;
+      }`);
+        }
+    }
+    if ((0, types_1.isListValueTypeName)(fullProtoTypeName)) {
+        const maybeReadyOnly = ctx.options.useReadonlyTypes ? "Readonly" : "";
+        chunks.push((0, ts_poet_1.code) `wrap(array: ${maybeReadyOnly}Array<any> | undefined): ListValue {
+      const result = createBaseListValue()${maybeAsAny(ctx.options)};
+      result.values = array ?? [];
+      return result;
+    }`);
+    }
+    if ((0, types_1.isFieldMaskTypeName)(fullProtoTypeName)) {
+        chunks.push((0, ts_poet_1.code) `wrap(paths: ${maybeReadonly(ctx.options)} string[]): FieldMask {
+      const result = createBaseFieldMask()${maybeAsAny(ctx.options)};
+      result.paths = paths;
+      return result;
+    }`);
+    }
+    return chunks;
+}
+exports.generateWrapShallow = generateWrapShallow;
+/**
+ * Converts proto's Struct/Value?listValue messages to ts-proto's idiomatic representation.
+ *
+ * We do this shallowly b/c ts-proto's decode methods handle recursion.
+ */
+function generateUnwrapShallow(ctx, fullProtoTypeName, fieldNames) {
+    const chunks = [];
+    if ((0, types_1.isStructTypeName)(fullProtoTypeName)) {
+        if (ctx.options.useMapType) {
+            chunks.push((0, ts_poet_1.code) `unwrap(message: Struct): {[key: string]: any} {
+        const object: { [key: string]: any } = {};
+        [...message.fields.keys()].forEach((key) => {
+          object[key] = message.fields.get(key);
+        });
+        return object;
+      }`);
+        }
+        else {
+            chunks.push((0, ts_poet_1.code) `unwrap(message: Struct): {[key: string]: any} {
+        const object: { [key: string]: any } = {};
+        if (message.fields) {
+          Object.keys(message.fields).forEach(key => {
+            object[key] = message.fields[key];
+          });
+        }
+        return object;
+      }`);
+        }
+    }
+    if ((0, types_1.isAnyValueTypeName)(fullProtoTypeName)) {
+        if (ctx.options.oneof === options_1.OneofOption.UNIONS) {
+            chunks.push((0, ts_poet_1.code) `unwrap(message: Value): string | number | boolean | Object | null | Array<any> | undefined {
+        if (message.kind?.$case === '${fieldNames.nullValue}') {
+          return null;
+        } else if (message.kind?.$case === '${fieldNames.numberValue}') {
+          return message.kind?.${fieldNames.numberValue};
+        } else if (message.kind?.$case === '${fieldNames.stringValue}') {
+          return message.kind?.${fieldNames.stringValue};
+        } else if (message.kind?.$case === '${fieldNames.boolValue}') {
+          return message.kind?.${fieldNames.boolValue};
+        } else if (message.kind?.$case === '${fieldNames.structValue}') {
+          return message.kind?.${fieldNames.structValue};
+        } else if (message.kind?.$case === '${fieldNames.listValue}') {
+          return message.kind?.${fieldNames.listValue};
+        } else {
+          return undefined;
+        }
+      }`);
+        }
+        else {
+            chunks.push((0, ts_poet_1.code) `unwrap(message: any): string | number | boolean | Object | null | Array<any> | undefined {
+        if (message.${fieldNames.stringValue} !== undefined) {
+          return message.${fieldNames.stringValue};
+        } else if (message?.${fieldNames.numberValue} !== undefined) {
+          return message.${fieldNames.numberValue};
+        } else if (message?.${fieldNames.boolValue} !== undefined) {
+          return message.${fieldNames.boolValue};
+        } else if (message?.${fieldNames.structValue} !== undefined) {
+          return message.${fieldNames.structValue} as any;
+        } else if (message?.${fieldNames.listValue} !== undefined) {
+          return message.${fieldNames.listValue};
+        } else if (message?.${fieldNames.nullValue} !== undefined) {
+          return null;
+        }
+        return undefined;
+      }`);
+        }
+    }
+    if ((0, types_1.isListValueTypeName)(fullProtoTypeName)) {
+        chunks.push((0, ts_poet_1.code) `unwrap(message: ${ctx.options.useReadonlyTypes ? "any" : "ListValue"}): Array<any> {
+      if (message?.hasOwnProperty('values') && Array.isArray(message.values)) {
+        return message.values;
+      } else {
+        return message as any;
+      }
+    }`);
+    }
+    if ((0, types_1.isFieldMaskTypeName)(fullProtoTypeName)) {
+        chunks.push((0, ts_poet_1.code) `unwrap(message: ${ctx.options.useReadonlyTypes ? "any" : "FieldMask"}): string[] {
+      return message.paths;
+    }`);
+    }
+    return chunks;
+}
+exports.generateUnwrapShallow = generateUnwrapShallow;
+function maybeReadonly(options) {
+    return options.useReadonlyTypes ? "readonly " : "";
+}
+function maybeAsAny(options) {
+    return options.useReadonlyTypes ? " as any" : "";
+}

package/build/main.js

@@ -18,6 +18,7 @@ const ConditionalOutput_1 = require("ts-poet/build/ConditionalOutput");
 const generate_grpc_js_1 = require("./generate-grpc-js");
 const generate_generic_service_definition_1 = require("./generate-generic-service-definition");
 const generate_nice_grpc_1 = require("./generate-nice-grpc");
+const generate_struct_wrappers_1 = require("./generate-struct-wrappers");
 function generateFile(ctx, fileDesc) {
     var _a;
     const { options, utils } = ctx;
@@ -72,11 +73,18 @@ function generateFile(ctx, fileDesc) {
             chunks.push(makeProtobufTimestampWrapper());
         }
     }
-    if (options.outputEncodeMethods || options.outputJsonMethods || options.outputTypeRegistry) {
+    // We add `nestJs` here because enough though it doesn't use our encode/decode methods
+    // for most/vanilla messages, we do generate static wrap/unwrap methods for the special
+    // Struct/Value/wrapper types and use the `wrappers[...]` to have NestJS know about them.
+    if (options.outputEncodeMethods || options.outputJsonMethods || options.outputTypeRegistry || options.nestJs) {
         // then add the encoder/decoder/base instance
         (0, visit_1.visit)(fileDesc, sourceInfo, (fullName, message, _sInfo, fullProtoTypeName) => {
             const fullTypeName = (0, utils_1.maybePrefixPackage)(fileDesc, fullProtoTypeName);
-            chunks.push(generateBaseInstanceFactory(ctx, fullName, message, fullTypeName));
+            const outputWrapAndUnwrap = (0, generate_struct_wrappers_1.isWrapperType)(fullTypeName);
+            // Only decode, fromPartial, and wrap use the createBase method
+            if (options.outputEncodeMethods || options.outputPartialMethods || outputWrapAndUnwrap) {
+                chunks.push(generateBaseInstanceFactory(ctx, fullName, message, fullTypeName));
+            }
             const staticMembers = [];
             if (options.outputTypeRegistry) {
                 staticMembers.push((0, ts_poet_1.code) `$type: '${fullTypeName}' as const`);
@@ -104,13 +112,21 @@ function generateFile(ctx, fileDesc) {
                 structValue: (0, case_1.maybeSnakeToCamel)("struct_value", ctx.options),
                 listValue: (0, case_1.maybeSnakeToCamel)("list_value", ctx.options),
             };
-            staticMembers.push(...generateWrap(ctx, fullTypeName, structFieldNames));
-            staticMembers.push(...generateUnwrap(ctx, fullTypeName, structFieldNames));
-            chunks.push((0, ts_poet_1.code) `
-          export const ${(0, ts_poet_1.def)(fullName)} = {
-            ${(0, ts_poet_1.joinCode)(staticMembers, { on: ",\n\n" })}
-          };
-        `);
+            if (options.nestJs) {
+                staticMembers.push(...(0, generate_struct_wrappers_1.generateWrapDeep)(ctx, fullTypeName, structFieldNames));
+                staticMembers.push(...(0, generate_struct_wrappers_1.generateUnwrapDeep)(ctx, fullTypeName, structFieldNames));
+            }
+            else {
+                staticMembers.push(...(0, generate_struct_wrappers_1.generateWrapShallow)(ctx, fullTypeName, structFieldNames));
+                staticMembers.push(...(0, generate_struct_wrappers_1.generateUnwrapShallow)(ctx, fullTypeName, structFieldNames));
+            }
+            if (staticMembers.length > 0) {
+                chunks.push((0, ts_poet_1.code) `
+            export const ${(0, ts_poet_1.def)(fullName)} = {
+              ${(0, ts_poet_1.joinCode)(staticMembers, { on: ",\n\n" })}
+            };
+          `);
+            }
             if (options.outputTypeRegistry) {
                 const messageTypeRegistry = (0, utils_1.impFile)(options, "messageTypeRegistry@./typeRegistry");
                 chunks.push((0, ts_poet_1.code) `
@@ -119,6 +135,11 @@ function generateFile(ctx, fileDesc) {
             }
         }, options);
     }
+    if (options.nestJs) {
+        if (fileDesc.messageType.find((message) => message.field.find(types_1.isStructType))) {
+            chunks.push(makeProtobufStructWrapper(options));
+        }
+    }
     let hasServerStreamingMethods = false;
     let hasStreamingMethods = false;
     (0, visit_1.visitServices)(fileDesc, sourceInfo, (serviceDesc, sInfo) => {
@@ -244,6 +265,15 @@ function makeProtobufTimestampWrapper() {
         },
       } as any;`;
 }
+function makeProtobufStructWrapper(options) {
+    const wrappers = (0, ts_poet_1.imp)("wrappers@protobufjs");
+    const Struct = (0, utils_1.impProto)(options, "google/protobuf/struct", "Struct");
+    return (0, ts_poet_1.code) `
+    ${wrappers}['.google.protobuf.Struct'] = {
+      fromObject: ${Struct}.wrap,
+      toObject: ${Struct}.unwrap,
+    } as any;`;
+}
 function makeLongUtils(options, bytes) {
     // Regardless of which `forceLong` config option we're using, we always use
     // the `long` library to either represent or at least sanity-check 64-bit values
@@ -771,6 +801,53 @@ function generateDecode(ctx, fullName, messageDesc) {
     chunks.push((0, ts_poet_1.code) `}`);
     return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });
 }
+/** Returns a generic writer.doSomething based on the basic type */
+function getEncodeWriteSnippet(ctx, field) {
+    const { options, utils } = ctx;
+    if ((0, types_1.isEnum)(field) && options.stringEnums) {
+        const tag = ((field.number << 3) | (0, types_1.basicWireType)(field.type)) >>> 0;
+        const toNumber = (0, types_1.getEnumMethod)(ctx, field.typeName, "ToNumber");
+        return (place) => (0, ts_poet_1.code) `writer.uint32(${tag}).${(0, types_1.toReaderCall)(field)}(${toNumber}(${place}))`;
+    }
+    else if ((0, types_1.isLong)(field) && options.forceLong === options_1.LongOption.BIGINT) {
+        const tag = ((field.number << 3) | (0, types_1.basicWireType)(field.type)) >>> 0;
+        return (place) => (0, ts_poet_1.code) `writer.uint32(${tag}).${(0, types_1.toReaderCall)(field)}(${place}.toString())`;
+    }
+    else if ((0, types_1.isScalar)(field) || (0, types_1.isEnum)(field)) {
+        const tag = ((field.number << 3) | (0, types_1.basicWireType)(field.type)) >>> 0;
+        return (place) => (0, ts_poet_1.code) `writer.uint32(${tag}).${(0, types_1.toReaderCall)(field)}(${place})`;
+    }
+    else if ((0, types_1.isObjectId)(field) && options.useMongoObjectId) {
+        const tag = ((field.number << 3) | 2) >>> 0;
+        const type = (0, types_1.basicTypeName)(ctx, field, { keepValueType: true });
+        return (place) => (0, ts_poet_1.code) `${type}.encode(${utils.toProtoObjectId}(${place}), writer.uint32(${tag}).fork()).ldelim()`;
+    }
+    else if ((0, types_1.isTimestamp)(field) && (options.useDate === options_1.DateOption.DATE || options.useDate === options_1.DateOption.STRING)) {
+        const tag = ((field.number << 3) | 2) >>> 0;
+        const type = (0, types_1.basicTypeName)(ctx, field, { keepValueType: true });
+        return (place) => (0, ts_poet_1.code) `${type}.encode(${utils.toTimestamp}(${place}), writer.uint32(${tag}).fork()).ldelim()`;
+    }
+    else if ((0, types_1.isValueType)(ctx, field)) {
+        const maybeTypeField = options.outputTypeRegistry ? `$type: '${field.typeName.slice(1)}',` : "";
+        const type = (0, types_1.basicTypeName)(ctx, field, { keepValueType: true });
+        const wrappedValue = (place) => {
+            if ((0, types_1.isAnyValueType)(field) || (0, types_1.isListValueType)(field) || (0, types_1.isStructType)(field) || (0, types_1.isFieldMaskType)(field)) {
+                return (0, ts_poet_1.code) `${type}.wrap(${place})`;
+            }
+            return (0, ts_poet_1.code) `{${maybeTypeField} value: ${place}!}`;
+        };
+        const tag = ((field.number << 3) | 2) >>> 0;
+        return (place) => (0, ts_poet_1.code) `${type}.encode(${wrappedValue(place)}, writer.uint32(${tag}).fork()).ldelim()`;
+    }
+    else if ((0, types_1.isMessage)(field)) {
+        const tag = ((field.number << 3) | 2) >>> 0;
+        const type = (0, types_1.basicTypeName)(ctx, field);
+        return (place) => (0, ts_poet_1.code) `${type}.encode(${place}, writer.uint32(${tag}).fork()).ldelim()`;
+    }
+    else {
+        throw new Error(`Unhandled field ${field}`);
+    }
+}
 /** Creates a function to encode a message by loop overing the tags. */
 function generateEncode(ctx, fullName, messageDesc) {
     const { options, utils, typeMap } = ctx;
@@ -783,54 +860,15 @@ function generateEncode(ctx, fullName, messageDesc) {
       writer: ${Writer} = ${Writer}.create(),
     ): ${Writer} {
   `);
+    const processedOneofs = new Set();
+    const oneOfFieldsDict = messageDesc.field
+        .filter((field) => (0, types_1.isWithinOneOfThatShouldBeUnion)(options, field))
+        .reduce((result, field) => ((result[field.oneofIndex] || (result[field.oneofIndex] = [])).push(field), result), {});
     // then add a case for each field
     messageDesc.field.forEach((field) => {
         const fieldName = (0, case_1.maybeSnakeToCamel)(field.name, options);
         // get a generic writer.doSomething based on the basic type
-        let writeSnippet;
-        if ((0, types_1.isEnum)(field) && options.stringEnums) {
-            const tag = ((field.number << 3) | (0, types_1.basicWireType)(field.type)) >>> 0;
-            const toNumber = (0, types_1.getEnumMethod)(ctx, field.typeName, "ToNumber");
-            writeSnippet = (place) => (0, ts_poet_1.code) `writer.uint32(${tag}).${(0, types_1.toReaderCall)(field)}(${toNumber}(${place}))`;
-        }
-        else if ((0, types_1.isLong)(field) && options.forceLong === options_1.LongOption.BIGINT) {
-            const tag = ((field.number << 3) | (0, types_1.basicWireType)(field.type)) >>> 0;
-            writeSnippet = (place) => (0, ts_poet_1.code) `writer.uint32(${tag}).${(0, types_1.toReaderCall)(field)}(${place}.toString())`;
-        }
-        else if ((0, types_1.isScalar)(field) || (0, types_1.isEnum)(field)) {
-            const tag = ((field.number << 3) | (0, types_1.basicWireType)(field.type)) >>> 0;
-            writeSnippet = (place) => (0, ts_poet_1.code) `writer.uint32(${tag}).${(0, types_1.toReaderCall)(field)}(${place})`;
-        }
-        else if ((0, types_1.isObjectId)(field) && options.useMongoObjectId) {
-            const tag = ((field.number << 3) | 2) >>> 0;
-            const type = (0, types_1.basicTypeName)(ctx, field, { keepValueType: true });
-            writeSnippet = (place) => (0, ts_poet_1.code) `${type}.encode(${utils.toProtoObjectId}(${place}), writer.uint32(${tag}).fork()).ldelim()`;
-        }
-        else if ((0, types_1.isTimestamp)(field) && (options.useDate === options_1.DateOption.DATE || options.useDate === options_1.DateOption.STRING)) {
-            const tag = ((field.number << 3) | 2) >>> 0;
-            const type = (0, types_1.basicTypeName)(ctx, field, { keepValueType: true });
-            writeSnippet = (place) => (0, ts_poet_1.code) `${type}.encode(${utils.toTimestamp}(${place}), writer.uint32(${tag}).fork()).ldelim()`;
-        }
-        else if ((0, types_1.isValueType)(ctx, field)) {
-            const maybeTypeField = options.outputTypeRegistry ? `$type: '${field.typeName.slice(1)}',` : "";
-            const type = (0, types_1.basicTypeName)(ctx, field, { keepValueType: true });
-            const wrappedValue = (place) => {
-                if ((0, types_1.isAnyValueType)(field) || (0, types_1.isListValueType)(field) || (0, types_1.isStructType)(field) || (0, types_1.isFieldMaskType)(field)) {
-                    return (0, ts_poet_1.code) `${type}.wrap(${place})`;
-                }
-                return (0, ts_poet_1.code) `{${maybeTypeField} value: ${place}!}`;
-            };
-            const tag = ((field.number << 3) | 2) >>> 0;
-            writeSnippet = (place) => (0, ts_poet_1.code) `${type}.encode(${wrappedValue(place)}, writer.uint32(${tag}).fork()).ldelim()`;
-        }
-        else if ((0, types_1.isMessage)(field)) {
-            const tag = ((field.number << 3) | 2) >>> 0;
-            const type = (0, types_1.basicTypeName)(ctx, field);
-            writeSnippet = (place) => (0, ts_poet_1.code) `${type}.encode(${place}, writer.uint32(${tag}).fork()).ldelim()`;
-        }
-        else {
-            throw new Error(`Unhandled field ${field}`);
-        }
+        const writeSnippet = getEncodeWriteSnippet(ctx, field);
         const isOptional = (0, types_1.isOptionalProperty)(field, messageDesc.options, options);
         if ((0, types_1.isRepeated)(field)) {
             if ((0, types_1.isMapType)(ctx, messageDesc, field)) {
@@ -925,12 +963,19 @@ function generateEncode(ctx, fullName, messageDesc) {
             }
         }
         else if ((0, types_1.isWithinOneOfThatShouldBeUnion)(options, field)) {
-            let oneofName = (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[field.oneofIndex].name, options);
-            chunks.push((0, ts_poet_1.code) `
-        if (message.${oneofName}?.$case === '${fieldName}') {
-          ${writeSnippet(`message.${oneofName}.${fieldName}`)};
-        }
-      `);
+            if (!processedOneofs.has(field.oneofIndex)) {
+                processedOneofs.add(field.oneofIndex);
+                const oneofName = (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[field.oneofIndex].name, options);
+                chunks.push((0, ts_poet_1.code) `switch (message.${oneofName}?.$case) {`);
+                for (const oneOfField of oneOfFieldsDict[field.oneofIndex]) {
+                    const writeSnippet = getEncodeWriteSnippet(ctx, oneOfField);
+                    const oneOfFieldName = (0, case_1.maybeSnakeToCamel)(oneOfField.name, ctx.options);
+                    chunks.push((0, ts_poet_1.code) `case "${oneOfFieldName}": 
+            ${writeSnippet(`message.${oneofName}.${oneOfFieldName}`)}; 
+            break;`);
+                }
+                chunks.push((0, ts_poet_1.code) `}`);
+            }
         }
         else if ((0, types_1.isWithinOneOf)(field)) {
             // Oneofs don't have a default value check b/c they need to denote which-oneof presence
@@ -1389,9 +1434,24 @@ function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
     return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });
 }
 function generateFromPartial(ctx, fullName, messageDesc) {
-    const { options, utils, typeMap } = ctx;
+    const { options, utils } = ctx;
     const chunks = [];
-    // create the basic function declaration
+    // create the create function definition
+    if (ctx.options.useExactTypes) {
+        chunks.push((0, ts_poet_1.code) `
+      create<I extends ${utils.Exact}<${utils.DeepPartial}<${fullName}>, I>>(base?: I): ${fullName} {
+    `);
+    }
+    else {
+        chunks.push((0, ts_poet_1.code) `
+      create(base?: ${utils.DeepPartial}<${fullName}>): ${fullName} {
+    `);
+    }
+    chunks.push((0, ts_poet_1.code) `
+    return ${fullName}.fromPartial(base ?? {})
+  `);
+    chunks.push((0, ts_poet_1.code) `},`, (0, ts_poet_1.code) ``);
+    // create the fromPartial function declaration
     const paramName = messageDesc.field.length > 0 ? "object" : "_";
     if (ctx.options.useExactTypes) {
         chunks.push((0, ts_poet_1.code) `
@@ -1538,164 +1598,6 @@ function generateFromPartial(ctx, fullName, messageDesc) {
     chunks.push((0, ts_poet_1.code) `}`);
     return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });
 }
-function generateWrap(ctx, fullProtoTypeName, fieldNames) {
-    const chunks = [];
-    if ((0, types_1.isStructTypeName)(fullProtoTypeName)) {
-        let setStatement = "struct.fields[key] = object[key];";
-        if (ctx.options.useMapType) {
-            setStatement = "struct.fields.set(key, object[key]);";
-        }
-        chunks.push((0, ts_poet_1.code) `wrap(object: {[key: string]: any} | undefined): Struct {
-      const struct = createBaseStruct();
-      if (object !== undefined) {
-        Object.keys(object).forEach(key => {
-          ${setStatement}
-        });
-      }
-      return struct;
-    }`);
-    }
-    if ((0, types_1.isAnyValueTypeName)(fullProtoTypeName)) {
-        if (ctx.options.oneof === options_1.OneofOption.UNIONS) {
-            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}', ${fieldNames.nullValue}: NullValue.NULL_VALUE};
-        } else if (typeof value === 'boolean') {
-          result.kind = {$case: '${fieldNames.boolValue}', ${fieldNames.boolValue}: value};
-        } else if (typeof value === 'number') {
-          result.kind = {$case: '${fieldNames.numberValue}', ${fieldNames.numberValue}: value};
-        } else if (typeof value === 'string') {
-          result.kind = {$case: '${fieldNames.stringValue}', ${fieldNames.stringValue}: value};
-        } else if (Array.isArray(value)) {
-          result.kind = {$case: '${fieldNames.listValue}', ${fieldNames.listValue}: value};
-        } else if (typeof value === 'object') {
-          result.kind = {$case: '${fieldNames.structValue}', ${fieldNames.structValue}: value};
-        } else if (typeof value !== 'undefined') {
-          throw new Error('Unsupported any value type: ' + typeof value);
-        }
-
-        return result;
-    }`);
-        }
-        else {
-            chunks.push((0, ts_poet_1.code) `wrap(value: any): Value {
-        const result = createBaseValue()${maybeAsAny(ctx.options)};
-
-        if (value === null) {
-          result.${fieldNames.nullValue} = NullValue.NULL_VALUE;
-        } else if (typeof value === 'boolean') {
-          result.${fieldNames.boolValue} = value;
-        } else if (typeof value === 'number') {
-          result.${fieldNames.numberValue} = value;
-        } else if (typeof value === 'string') {
-          result.${fieldNames.stringValue} = value;
-        } else if (Array.isArray(value)) {
-          result.${fieldNames.listValue} = value;
-        } else if (typeof value === 'object') {
-          result.${fieldNames.structValue} = value;
-        } else if (typeof value !== 'undefined') {
-          throw new Error('Unsupported any value type: ' + typeof value);
-        }
-
-        return result;
-    }`);
-        }
-    }
-    if ((0, types_1.isListValueTypeName)(fullProtoTypeName)) {
-        chunks.push((0, ts_poet_1.code) `wrap(value: ${ctx.options.useReadonlyTypes ? "ReadonlyArray<any>" : "Array<any>"} | undefined): ListValue {
-      const result = createBaseListValue()${maybeAsAny(ctx.options)};
-
-      result.values = value ?? [];
-
-      return result;
-    }`);
-    }
-    if ((0, types_1.isFieldMaskTypeName)(fullProtoTypeName)) {
-        chunks.push((0, ts_poet_1.code) `wrap(paths: ${maybeReadonly(ctx.options)} string[]): FieldMask {
-      const result = createBaseFieldMask()${maybeAsAny(ctx.options)};
-
-      result.paths = paths;
-
-      return result;
-    }`);
-    }
-    return chunks;
-}
-function generateUnwrap(ctx, fullProtoTypeName, fieldNames) {
-    const chunks = [];
-    if ((0, types_1.isStructTypeName)(fullProtoTypeName)) {
-        if (ctx.options.useMapType) {
-            chunks.push((0, ts_poet_1.code) `unwrap(message: Struct): {[key: string]: any} {
-        const object: { [key: string]: any } = {};
-        [...message.fields.keys()].forEach((key) => {
-          object[key] = message.fields.get(key);
-        });
-        return object;
-      }`);
-        }
-        else {
-            chunks.push((0, ts_poet_1.code) `unwrap(message: Struct): {[key: string]: any} {
-        const object: { [key: string]: any } = {};
-        Object.keys(message.fields).forEach(key => {
-          object[key] = message.fields[key];     
-        });
-        return object;
-      }`);
-        }
-    }
-    if ((0, types_1.isAnyValueTypeName)(fullProtoTypeName)) {
-        if (ctx.options.oneof === options_1.OneofOption.UNIONS) {
-            chunks.push((0, ts_poet_1.code) `unwrap(message: Value): string | number | boolean | Object | null | Array<any> | undefined {
-        if (message.kind?.$case === '${fieldNames.nullValue}') {
-          return null;
-        } else if (message.kind?.$case === '${fieldNames.numberValue}') {
-          return message.kind?.${fieldNames.numberValue};
-        } else if (message.kind?.$case === '${fieldNames.stringValue}') {
-          return message.kind?.${fieldNames.stringValue};
-        } else if (message.kind?.$case === '${fieldNames.boolValue}') {
-          return message.kind?.${fieldNames.boolValue};
-        } else if (message.kind?.$case === '${fieldNames.structValue}') {
-          return message.kind?.${fieldNames.structValue};
-        } else if (message.kind?.$case === '${fieldNames.listValue}') {
-          return message.kind?.${fieldNames.listValue};
-        } else {
-          return undefined;
-        }
-      }`);
-        }
-        else {
-            chunks.push((0, ts_poet_1.code) `unwrap(message: Value): string | number | boolean | Object | null | Array<any> | undefined {
-        if (message?.${fieldNames.stringValue} !== undefined) {
-          return message.${fieldNames.stringValue};
-        } else if (message?.${fieldNames.numberValue} !== undefined) {
-          return message.${fieldNames.numberValue};
-        } else if (message?.${fieldNames.boolValue} !== undefined) {
-          return message.${fieldNames.boolValue};
-        } else if (message?.${fieldNames.structValue} !== undefined) {
-          return message.${fieldNames.structValue};
-        } else if (message?.${fieldNames.listValue} !== undefined) {
-            return message.${fieldNames.listValue};
-        } else if (message?.${fieldNames.nullValue} !== undefined) {
-          return null;
-        }
-        return undefined;
-      }`);
-        }
-    }
-    if ((0, types_1.isListValueTypeName)(fullProtoTypeName)) {
-        chunks.push((0, ts_poet_1.code) `unwrap(message: ${ctx.options.useReadonlyTypes ? "any" : "ListValue"}): Array<any> {
-      return message.values;
-    }`);
-    }
-    if ((0, types_1.isFieldMaskTypeName)(fullProtoTypeName)) {
-        chunks.push((0, ts_poet_1.code) `unwrap(message: ${ctx.options.useReadonlyTypes ? "any" : "FieldMask"}): string[] {
-      return message.paths;
-    }`);
-    }
-    return chunks;
-}
 exports.contextTypeVar = "Context extends DataLoaders";
 function maybeCastToNumber(ctx, messageDesc, field, variableName) {
     const { keyType } = (0, types_1.detectMapType)(ctx, messageDesc, field);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-proto",
-  "version": "1.137.2",
+  "version": "1.139.0",
   "description": "",
   "main": "build/plugin.js",
   "repository": "github:stephenh/ts-proto",
@@ -28,8 +28,8 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@grpc/grpc-js": "^1.2.12",
-    "@grpc/proto-loader": "^0.5.6",
+    "@grpc/grpc-js": "^1.3.0",
+    "@grpc/proto-loader": "^0.6.0",
     "@improbable-eng/grpc-web": "^0.14.0",
     "@improbable-eng/grpc-web-node-http-transport": "^0.14.0",
     "@nestjs/common": "^8.2.2",