ts-proto 1.169.0 → 1.170.0

package/build/generate-services.js

@@ -42,15 +42,15 @@ function generateService(ctx, fileDesc, sourceInfo, serviceDesc) {
             // We have to use grpc.Metadata where grpc will come from @improbable-eng
             params.push((0, ts_poet_1.code) `metadata?: grpc.Metadata`);
         }
-        else if (options.addGrpcMetadata) {
-            const Metadata = (0, ts_poet_1.imp)("Metadata@@grpc/grpc-js");
-            const q = options.addNestjsRestParameter ? "" : "?";
-            params.push((0, ts_poet_1.code) `metadata${q}: ${Metadata}`);
-        }
         else if (options.metadataType) {
+            // custom `metadataType` has precedence over `addGrpcMetadata` that injects Metadata from grpc-js
             const Metadata = (0, ts_poet_1.imp)(options.metadataType);
             params.push((0, ts_poet_1.code) `metadata?: ${Metadata}`);
         }
+        else if (options.addGrpcMetadata) {
+            const Metadata = (0, ts_poet_1.imp)("Metadata@@grpc/grpc-js");
+            params.push((0, ts_poet_1.code) `metadata?: ${Metadata}`);
+        }
         if (options.useAbortSignal) {
             params.push((0, ts_poet_1.code) `abortSignal?: AbortSignal`);
         }
@@ -80,12 +80,15 @@ function generateRegularRpcMethod(ctx, methodDesc) {
     const rawInputType = (0, types_1.rawRequestType)(ctx, methodDesc, { keepValueType: true });
     const inputType = (0, types_1.requestType)(ctx, methodDesc);
     const rawOutputType = (0, types_1.responseType)(ctx, methodDesc, { keepValueType: true });
+    const metadataType = options.metadataType ? (0, ts_poet_1.imp)(options.metadataType) : (0, ts_poet_1.imp)("Metadata@@grpc/grpc-js");
     const params = [
         ...(options.context ? [(0, ts_poet_1.code) `ctx: Context`] : []),
         (0, ts_poet_1.code) `request: ${inputType}`,
+        ...(options.metadataType || options.addGrpcMetadata ? [(0, ts_poet_1.code) `metadata?: ${metadataType}`] : []),
         ...(options.useAbortSignal ? [(0, ts_poet_1.code) `abortSignal?: AbortSignal`] : []),
     ];
     const maybeCtx = options.context ? "ctx," : "";
+    const maybeMetadata = options.addGrpcMetadata ? "metadata," : "";
     const maybeAbortSignal = options.useAbortSignal ? "abortSignal || undefined," : "";
     let errorHandler;
     if (options.rpcErrorHandler) {
@@ -156,6 +159,7 @@ function generateRegularRpcMethod(ctx, methodDesc) {
         this.service,
         "${methodDesc.name}",
         data,
+        ${maybeMetadata}
         ${maybeAbortSignal}
       );
       return ${returnStatement};
@@ -330,8 +334,11 @@ function generateCachingRpcMethod(ctx, fileDesc, serviceDesc, methodDesc) {
  */
 function generateRpcType(ctx, hasStreamingMethods) {
     const { options } = ctx;
+    const metadata = options.metadataType ? (0, ts_poet_1.imp)(options.metadataType) : (0, ts_poet_1.imp)("Metadata@@grpc/grpc-js");
+    const metadataType = metadata.symbol;
     const maybeContext = options.context ? "<Context>" : "";
     const maybeContextParam = options.context ? "ctx: Context," : "";
+    const maybeMetadataParam = options.metadataType || options.addGrpcMetadata ? `metadata?: ${metadataType},` : "";
     const maybeAbortSignalParam = options.useAbortSignal ? "abortSignal?: AbortSignal," : "";
     const methods = [[(0, ts_poet_1.code) `request`, (0, ts_poet_1.code) `Uint8Array`, (0, ts_poet_1.code) `Promise<Uint8Array>`]];
     const additionalMethods = [];
@@ -363,6 +370,7 @@ function generateRpcType(ctx, hasStreamingMethods) {
         service: string,
         method: string,
         data: ${method[1]},
+        ${maybeMetadataParam}
         ${maybeAbortSignalParam}
       ): ${method[2]};`);
     });

package/build/main.js

@@ -895,7 +895,7 @@ function generateDecode(ctx, fullName, messageDesc) {
         const initializerNecessary = !options.initializeFieldsAsUndefined &&
             (0, types_1.isOptionalProperty)(field, messageDesc.options, options, currentFile.isProto3Syntax);
         if ((0, types_1.isRepeated)(field)) {
-            const maybeNonNullAssertion = ctx.options.useOptionals === "all" ? "!" : "";
+            const maybeNonNullAssertion = ctx.options.useOptionals === "all" || ctx.options.useOptionals === "deprecatedOnly" ? "!" : "";
             const mapType = (0, types_1.detectMapType)(ctx, messageDesc, field);
             if (mapType) {
                 // We need a unique const within the `cast` statement

package/build/types.js

@@ -330,15 +330,20 @@ function isScalar(field) {
 }
 exports.isScalar = isScalar;
 // When useOptionals='messages', non-scalar fields are translated into optional
-// properties. When useOptionals='all', all fields are translated into
+// properties.
+// When useOptionals='all', all fields are translated into
+// optional properties, with the exception of map Entry key/values, which must
+// always be present.
+// When useOptionals='deprecatedOnly', all deprecated fields are translated into
 // optional properties, with the exception of map Entry key/values, which must
 // always be present.
 // OneOf fields are always optional, whenever oneof=unions option not in use.
 function isOptionalProperty(field, messageOptions, options, isProto3Syntax) {
     const optionalMessages = options.useOptionals === true || options.useOptionals === "messages" || options.useOptionals === "all";
     const optionalAll = options.useOptionals === "all";
+    const deprecatedOnly = options.useOptionals === "deprecatedOnly" && field.options && field.options.deprecated;
     return ((optionalMessages && isMessage(field) && !isRepeated(field)) ||
-        (optionalAll && !(messageOptions === null || messageOptions === void 0 ? void 0 : messageOptions.mapEntry)) ||
+        ((optionalAll || deprecatedOnly) && !(messageOptions === null || messageOptions === void 0 ? void 0 : messageOptions.mapEntry)) ||
         // 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 &&

package/package.json

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