ts-proto 2.11.2 → 2.11.5

package/README.markdown

@@ -830,21 +830,19 @@ Instead, we recommend using the `oneof=unions-value` option, which will change t
 
 ```typescript
 interface YourMessage {
-  eitherField?: { $case: "field_a"; value: string } | { $case: "field_b"; value: string };
+  eitherField: { $case: "field_a"; value: string } | { $case: "field_b"; value: string } | undefined;
 }
 ```
 
 As this will automatically enforce only one of `field_a` or `field_b` "being set" at a time, because the values are stored in the `eitherField` field that can only have a single value at a time.
 
-(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-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 };
+  eitherField: { $case: "field_a"; field_a: string } | { $case: "field_b"; field_b: string } | undefined;
 }
 ```
 

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

@@ -47,9 +47,9 @@ function generateMethodDefinition(ctx, methodDesc) {
     return (0, ts_poet_1.code) `
     {
       name: '${methodDesc.name}',
-      requestType: ${inputType},
+      requestType: ${inputType} as typeof ${inputType},
       requestStream: ${methodDesc.clientStreaming},
-      responseType: ${outputType},
+      responseType: ${outputType} as typeof ${outputType},
       responseStream: ${methodDesc.serverStreaming},
       options: ${generateMethodOptions(ctx, methodDesc.options)}
     }
@@ -72,7 +72,7 @@ function generateMethodOptions(ctx, options) {
                 const values = options._unknownFields[key];
                 const valuesChunks = [];
                 for (const value of values) {
-                    valuesChunks.push((0, ts_poet_1.code) `${ctx.options.env == "node" ? "Buffer.from" : "new Uint8Array"}([${value.join(", ")}])`);
+                    valuesChunks.push((0, ts_poet_1.code) `${ctx.options.env == "node" ? "Buffer.from" : "new Uint8Array"}([${value.join(", ")}]) as ${ctx.options.env == "node" ? "Buffer" : "Uint8Array"}`);
                 }
                 unknownFieldsChunks.push((0, ts_poet_1.code) `${key}: [\n${(0, ts_poet_1.joinCode)(valuesChunks, { on: "," })}\n],`);
             }

package/build/src/generate-grpc-js.js

@@ -61,9 +61,9 @@ function generateServiceDefinition(ctx, fileDesc, sourceInfo, serviceDesc) {
         const outputDecoder = (0, encode_1.generateDecoder)(ctx, methodDesc.outputType);
         chunks.push((0, ts_poet_1.code) `
       ${methodDesc.formattedName}: {
-        path: '/${(0, utils_1.maybePrefixPackage)(fileDesc, serviceDesc.name)}/${methodDesc.name}',
-        requestStream: ${methodDesc.clientStreaming},
-        responseStream: ${methodDesc.serverStreaming},
+        path: '/${(0, utils_1.maybePrefixPackage)(fileDesc, serviceDesc.name)}/${methodDesc.name}' as const,
+        requestStream: ${methodDesc.clientStreaming} as const,
+        responseStream: ${methodDesc.serverStreaming} as const,
         requestSerialize: (value: ${inputType}): Buffer =>
           Buffer.from(${inputEncoder}),
         requestDeserialize: (value: Buffer): ${inputType} => ${inputDecoder},

package/build/src/generate-services.js

@@ -232,7 +232,10 @@ function generateServiceClientImpl(ctx, fileDesc, serviceDesc) {
                 chunks.push(generateBatchingRpcMethod(ctx, batchMethod));
             }
         }
-        if (options.context && methodDesc.name.match(/^Get[A-Z]/)) {
+        if (options.context &&
+            methodDesc.name.match(/^Get[A-Z]/) &&
+            !methodDesc.serverStreaming &&
+            !methodDesc.clientStreaming) {
             chunks.push(generateCachingRpcMethod(ctx, fileDesc, serviceDesc, methodDesc));
         }
         else {

package/build/src/main.js

@@ -912,7 +912,8 @@ function generateOneofProperty(ctx, messageDesc, oneofIndex, sourceInfo) {
         return (0, ts_poet_1.code) `|${combinedComments ? " // " : ""}\n ${combinedComments} { ${mbReadonly}$case: '${fieldName}', ${mbReadonly}${valueName}: ${typeName} }`;
     }));
     const name = (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[oneofIndex].name, options);
-    return (0, ts_poet_1.joinCode)([...outerComments, (0, ts_poet_1.code) `${mbReadonly}${name}?:`, unionType, (0, ts_poet_1.code) `| ${(0, utils_1.nullOrUndefined)(options)},`], {
+    const optionalFlag = options.useOptionals === "none" ? "" : "?";
+    return (0, ts_poet_1.joinCode)([...outerComments, (0, ts_poet_1.code) `${mbReadonly}${name}${optionalFlag}:`, unionType, (0, ts_poet_1.code) `| ${(0, utils_1.nullOrUndefined)(options)},`], {
         on: "\n",
     });
 }

package/package.json

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