ts-proto 2.18.4 → 2.18.6

package/README.markdown

@@ -493,7 +493,7 @@ With `--ts_proto_opt=protoJsonFormat=false`, strict proto3 compliance is disable
 
 - With `--ts_proto_opt=outputTypeAnnotations=true`, each message will be given a `$type` field containing its fully-qualified name. You can use `--ts_proto_opt=outputTypeAnnotations=static-only` to omit it from the `interface` declaration, or `--ts_proto_opt=outputTypeAnnotations=optional` to make it an optional property on the `interface` definition. The latter option may be useful if you want to use the `$type` field for runtime type checking on responses from a server.
 
-- With `--ts_proto_opt=outputTypeRegistry=true`, the type registry will be generated that can be used to resolve message types by fully-qualified name. Also, each message will be given a `$type` field containing its fully-qualified name.
+- With `--ts_proto_opt=outputTypeRegistry=true`, the type registry will be generated that can be used to resolve message types by fully-qualified name. Also, each message will be given a `$type` field containing its fully-qualified name. The registry's `MessageType` only declares the methods that are generated, so it also works with options like `outputEncodeMethods=encode-only` or `outputJsonMethods=to-only`.
 
 - With `--ts_proto_opt=outputServices=grpc-js`, ts-proto will output service definitions and server / client stubs in [grpc-js](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js) format.
 

package/build/src/generate-struct-wrappers.js

@@ -91,7 +91,7 @@ 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: ${(0, utils_1.wrapTypeName)(ctx.options, "Struct")}: {[key: string]: any} {
+            chunks.push((0, ts_poet_1.code) `unwrap(message: ${(0, utils_1.wrapTypeName)(ctx.options, "Struct")}): {[key: string]: any} {
         const object: { [key: string]: any } = {};
         if (message.fields) {
           for (const key of message.fields.keys()) {

package/build/src/generate-type-registry.js

@@ -33,14 +33,25 @@ function generateMessageType(ctx) {
     else {
         chunks.push((0, ts_poet_1.code) `$type: string;`);
     }
-    if (ctx.options.outputEncodeMethods) {
-        const BinaryReader = (0, ts_poet_1.imp)("t:BinaryReader@@bufbuild/protobuf/wire");
-        const BinaryWriter = (0, ts_poet_1.imp)("t:BinaryWriter@@bufbuild/protobuf/wire");
+    // Only declare the methods that are actually generated on each message, e.g. with
+    // `outputJsonMethods=to-only` the messages have no `fromJSON` to register.
+    const { outputEncodeMethods, outputJsonMethods } = ctx.options;
+    const hasEncode = outputEncodeMethods === true ||
+        outputEncodeMethods === "encode-only" ||
+        outputEncodeMethods === "encode-no-creation";
+    const hasDecode = outputEncodeMethods === true || outputEncodeMethods === "decode-only";
+    const BinaryReader = (0, ts_poet_1.imp)("t:BinaryReader@@bufbuild/protobuf/wire");
+    const BinaryWriter = (0, ts_poet_1.imp)("t:BinaryWriter@@bufbuild/protobuf/wire");
+    if (hasEncode) {
         chunks.push((0, ts_poet_1.code) `encode(message: Message, writer?: ${BinaryWriter}): ${BinaryWriter};`);
+    }
+    if (hasDecode) {
         chunks.push((0, ts_poet_1.code) `decode(input: ${BinaryReader} | Uint8Array, length?: number): Message;`);
     }
-    if (ctx.options.outputJsonMethods) {
+    if (outputJsonMethods === true || outputJsonMethods === "from-only") {
         chunks.push((0, ts_poet_1.code) `fromJSON(object: any): Message;`);
+    }
+    if (outputJsonMethods === true || outputJsonMethods === "to-only") {
         chunks.push((0, ts_poet_1.code) `toJSON(message: Message): unknown;`);
     }
     if (ctx.options.outputPartialMethods) {

package/package.json

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