ts-proto 2.15.1 → 2.15.3

package/build/src/generate-services.js

@@ -339,10 +339,10 @@ 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)("t: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},` : "";
+    // Use the import itself, so it is added even if no method of the service refers to it.
+    const maybeMetadataParam = options.metadataType || options.addGrpcMetadata ? (0, ts_poet_1.code) `metadata?: ${metadata},` : "";
     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 = [];

package/build/src/main.d.ts

@@ -24,7 +24,7 @@ declare function makeDeepPartial(options: Options, longs: ReturnType<typeof make
     Exact: ConditionalOutput;
 };
 declare function makeMessageFns(options: Options, deepPartial: ReturnType<typeof makeDeepPartial>, extension: ReturnType<typeof makeExtensionClass>): {
-    MessageFns: ConditionalOutput;
+    MessageFns: ConditionalOutput | undefined;
     ExtensionFns: ConditionalOutput;
     ExtensionHolder: ConditionalOutput;
     StructWrapperFns: ConditionalOutput;

package/build/src/main.js

@@ -88,14 +88,15 @@ function generateFile(ctx, fileDesc) {
         (0, visit_1.visit)(fileDesc, sourceInfo, (fullName, message, _sInfo, fullProtoTypeName) => {
             const fullTypeName = (0, utils_1.maybePrefixPackage)(fileDesc, fullProtoTypeName);
             const outputWrapAndUnwrap = (0, generate_struct_wrappers_1.isWrapperType)(fullTypeName);
-            // Only decode, fromPartial, and wrap use the createBase method
+            // Only decode, fromPartial, and wrap use the createBase method. The deep `Value.wrap`
+            // generated for NestJS builds its result without it.
             if ((options.outputEncodeMethods &&
                 options.outputEncodeMethods !== "encode-no-creation" &&
                 options.outputEncodeMethods !== "encode-only" &&
                 (options.outputDecodeIncludeTypes === "" ||
                     new RegExp(options.outputDecodeIncludeTypes).test(fullTypeName))) ||
                 options.outputPartialMethods ||
-                outputWrapAndUnwrap) {
+                (outputWrapAndUnwrap && !(options.nestJs && (0, types_1.isAnyValueTypeName)(fullTypeName)))) {
                 chunks.push(generateBaseInstanceFactory(ctx, fullName, message, fullTypeName));
             }
             const staticMembers = [];
@@ -172,7 +173,10 @@ function generateFile(ctx, fileDesc) {
                 const messageFnsTypeParameters = [fullName, hasTypeMember && `'${fullTypeName}'`]
                     .filter((p) => !!p)
                     .join(", ");
-                const interfaces = [(0, ts_poet_1.code) `${utils.MessageFns}<${messageFnsTypeParameters}>`];
+                const interfaces = [];
+                if (utils.MessageFns) {
+                    interfaces.push((0, ts_poet_1.code) `${utils.MessageFns}<${messageFnsTypeParameters}>`);
+                }
                 if (options.outputEncodeMethods &&
                     options.outputExtensions &&
                     options.unknownFields &&
@@ -601,11 +605,15 @@ function makeMessageFns(options, deepPartial, extension) {
         }
     }
     const maybeExport = options.exportCommonSymbols ? "export" : "";
-    const MessageFns = (0, ts_poet_1.conditionalOutput)("MessageFns", (0, ts_poet_1.code) `
-      ${maybeExport} interface MessageFns<T${hasTypeMember ? ", V extends string" : ""}> {
-        ${(0, ts_poet_1.joinCode)(commonStaticMembers, { on: "\n" })}
-      }
-    `);
+    // Without any common members, e.g. with only the NestJS wrappers, the interface
+    // would be empty and its type parameter unused, so it is not generated at all.
+    const MessageFns = commonStaticMembers.length > 0
+        ? (0, ts_poet_1.conditionalOutput)("MessageFns", (0, ts_poet_1.code) `
+            ${maybeExport} interface MessageFns<T${hasTypeMember ? ", V extends string" : ""}> {
+              ${(0, ts_poet_1.joinCode)(commonStaticMembers, { on: "\n" })}
+            }
+          `)
+        : undefined;
     const ExtensionFns = (0, ts_poet_1.conditionalOutput)("ExtensionFns", (0, ts_poet_1.code) `
       ${maybeExport} interface ExtensionFns<T> {
         ${(0, ts_poet_1.joinCode)(extensionStaticMembers, { on: "\n" })}
@@ -1892,6 +1900,27 @@ function generateExtension(ctx, message, extension) {
         extensionInfo: (0, ts_poet_1.joinCode)(chunks, { on: "\n" }),
     };
 }
+/** Converts the JSON of a wrapper type, such as `google.protobuf.Int64Value`, to the unwrapped value. */
+function valueTypeFromJson(ctx, field, from) {
+    const { options } = ctx;
+    const valueType = (0, types_1.valueTypeName)(ctx, field.typeName);
+    if ((0, types_1.isLongValueType)(field) && options.forceLong === options_1.LongOption.LONG) {
+        return (0, ts_poet_1.code) `${(0, case_1.capitalize)(valueType.toCodeString([]))}.fromValue(${from})`;
+    }
+    else if ((0, types_1.isLongValueType)(field) && options.forceLong === options_1.LongOption.BIGINT) {
+        return (0, ts_poet_1.code) `BigInt(${from})`;
+    }
+    else if ((0, types_1.isBytesValueType)(field)) {
+        return (0, ts_poet_1.code) `new ${(0, case_1.capitalize)(valueType.toCodeString([]))}(${from})`;
+    }
+    else {
+        return (0, ts_poet_1.code) `${(0, case_1.capitalize)(valueType.toCodeString([]))}(${from})`;
+    }
+}
+/** Whether `field` is a 64-bit wrapper type unwrapped to a `Long` or `bigint`, which JSON writes as a string. */
+function isLongValueTypeAsObject(options, field) {
+    return (0, types_1.isLongValueType)(field) && (options.forceLong === options_1.LongOption.LONG || options.forceLong === options_1.LongOption.BIGINT);
+}
 /**
  * Creates a function to decode a message from JSON.
  *
@@ -2034,19 +2063,7 @@ function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
                 return (0, ts_poet_1.code) `[...${from}]`;
             }
             else if ((0, types_1.isValueType)(ctx, field)) {
-                const valueType = (0, types_1.valueTypeName)(ctx, field.typeName);
-                if ((0, types_1.isLongValueType)(field) && options.forceLong === options_1.LongOption.LONG) {
-                    return (0, ts_poet_1.code) `${(0, case_1.capitalize)(valueType.toCodeString([]))}.fromValue(${from})`;
-                }
-                else if ((0, types_1.isLongValueType)(field) && options.forceLong === options_1.LongOption.BIGINT) {
-                    return (0, ts_poet_1.code) `BigInt(${from})`;
-                }
-                else if ((0, types_1.isBytesValueType)(field)) {
-                    return (0, ts_poet_1.code) `new ${(0, case_1.capitalize)(valueType.toCodeString([]))}(${from})`;
-                }
-                else {
-                    return (0, ts_poet_1.code) `${(0, case_1.capitalize)(valueType.toCodeString([]))}(${from})`;
-                }
+                return valueTypeFromJson(ctx, field, from);
             }
             else if ((0, types_1.isMessage)(field)) {
                 if ((0, types_1.isRepeated)(field) && (0, types_1.isMapType)(ctx, messageDesc, field)) {
@@ -2089,6 +2106,9 @@ function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
                             options.useDate === options_1.DateOption.TIMESTAMP)) {
                         return (0, ts_poet_1.code) `${utils.fromJsonTimestamp}(${from})`;
                     }
+                    else if ((0, types_1.isLongValueType)(valueField)) {
+                        return valueTypeFromJson(ctx, valueField, from);
+                    }
                     else if ((0, types_1.isValueType)(ctx, valueField)) {
                         return (0, ts_poet_1.code) `${from} as ${valueType}`;
                     }
@@ -2488,6 +2508,10 @@ function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
                 else if ((0, types_1.isFloatingPoint)(valueType)) {
                     return (0, ts_poet_1.code) `${utils.floatToJson}(${from})`;
                 }
+                else if (isLongValueTypeAsObject(options, valueType)) {
+                    // Map values of wrapper types are declared `| undefined`.
+                    return (0, ts_poet_1.code) `${from}?.toString()`;
+                }
                 else if ((0, types_1.isScalar)(valueType) || (0, types_1.isValueType)(ctx, valueType)) {
                     return (0, ts_poet_1.code) `${from}`;
                 }
@@ -2513,6 +2537,9 @@ function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
             else if ((0, types_1.isBytes)(field)) {
                 return (0, ts_poet_1.code) `${utils.base64FromBytes}(${from})`;
             }
+            else if (isLongValueTypeAsObject(options, field)) {
+                return (0, ts_poet_1.code) `${from}.toString()`;
+            }
             else if ((0, types_1.isLong)(field) && (0, types_1.isJsTypeFieldOption)(options, field)) {
                 const fieldType = (0, types_1.getFieldOptionsJsType)(field, ctx.options) ?? field.type;
                 if (!fieldType) {

package/package.json

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