ts-proto 1.166.0 → 1.166.1

package/build/main.js

@@ -181,7 +181,7 @@ function generateFile(ctx, fileDesc) {
     let hasStreamingMethods = false;
     (0, visit_1.visitServices)(fileDesc, sourceInfo, (serviceDesc, sInfo) => {
         if (options.nestJs) {
-            // NestJS is sufficiently different that we special case all of the client/server interfaces
+            // NestJS is sufficiently different that we special case the client/server interfaces
             // generate nestjs grpc client interface
             chunks.push((0, generate_nestjs_1.generateNestjsServiceClient)(ctx, fileDesc, sInfo, serviceDesc));
             // and the service controller interface
@@ -194,40 +194,38 @@ function generateFile(ctx, fileDesc) {
             }
             chunks.push((0, ts_poet_1.code) `export const ${serviceConstName} = "${serviceDesc.name}";`);
         }
-        else {
-            const uniqueServices = [...new Set(options.outputServices)].sort();
-            uniqueServices.forEach((outputService) => {
-                if (outputService === options_1.ServiceOption.GRPC) {
-                    chunks.push((0, generate_grpc_js_1.generateGrpcJsService)(ctx, fileDesc, sInfo, serviceDesc));
-                }
-                else if (outputService === options_1.ServiceOption.NICE_GRPC) {
-                    chunks.push((0, generate_nice_grpc_1.generateNiceGrpcService)(ctx, fileDesc, sInfo, serviceDesc));
-                }
-                else if (outputService === options_1.ServiceOption.GENERIC) {
-                    chunks.push((0, generate_generic_service_definition_1.generateGenericServiceDefinition)(ctx, fileDesc, sInfo, serviceDesc));
+        const uniqueServices = [...new Set(options.outputServices)].sort();
+        uniqueServices.forEach((outputService) => {
+            if (outputService === options_1.ServiceOption.GRPC) {
+                chunks.push((0, generate_grpc_js_1.generateGrpcJsService)(ctx, fileDesc, sInfo, serviceDesc));
+            }
+            else if (outputService === options_1.ServiceOption.NICE_GRPC) {
+                chunks.push((0, generate_nice_grpc_1.generateNiceGrpcService)(ctx, fileDesc, sInfo, serviceDesc));
+            }
+            else if (outputService === options_1.ServiceOption.GENERIC) {
+                chunks.push((0, generate_generic_service_definition_1.generateGenericServiceDefinition)(ctx, fileDesc, sInfo, serviceDesc));
+            }
+            else if (outputService === options_1.ServiceOption.DEFAULT) {
+                // This service could be Twirp or grpc-web or JSON (maybe). So far all of their
+                // interfaces are fairly similar so we share the same service interface.
+                chunks.push((0, generate_services_1.generateService)(ctx, fileDesc, sInfo, serviceDesc));
+                if (options.outputClientImpl === true) {
+                    chunks.push((0, generate_services_1.generateServiceClientImpl)(ctx, fileDesc, serviceDesc));
                 }
-                else if (outputService === options_1.ServiceOption.DEFAULT) {
-                    // This service could be Twirp or grpc-web or JSON (maybe). So far all of their
-                    // interfaces are fairly similar so we share the same service interface.
-                    chunks.push((0, generate_services_1.generateService)(ctx, fileDesc, sInfo, serviceDesc));
-                    if (options.outputClientImpl === true) {
-                        chunks.push((0, generate_services_1.generateServiceClientImpl)(ctx, fileDesc, serviceDesc));
-                    }
-                    else if (options.outputClientImpl === "grpc-web") {
-                        chunks.push((0, generate_grpc_web_1.generateGrpcClientImpl)(ctx, fileDesc, serviceDesc));
-                        chunks.push((0, generate_grpc_web_1.generateGrpcServiceDesc)(fileDesc, serviceDesc));
-                        serviceDesc.method.forEach((method) => {
-                            if (!method.clientStreaming) {
-                                chunks.push((0, generate_grpc_web_1.generateGrpcMethodDesc)(ctx, serviceDesc, method));
-                            }
-                            if (method.serverStreaming) {
-                                hasServerStreamingMethods = true;
-                            }
-                        });
-                    }
+                else if (options.outputClientImpl === "grpc-web") {
+                    chunks.push((0, generate_grpc_web_1.generateGrpcClientImpl)(ctx, fileDesc, serviceDesc));
+                    chunks.push((0, generate_grpc_web_1.generateGrpcServiceDesc)(fileDesc, serviceDesc));
+                    serviceDesc.method.forEach((method) => {
+                        if (!method.clientStreaming) {
+                            chunks.push((0, generate_grpc_web_1.generateGrpcMethodDesc)(ctx, serviceDesc, method));
+                        }
+                        if (method.serverStreaming) {
+                            hasServerStreamingMethods = true;
+                        }
+                    });
                 }
-            });
-        }
+            }
+        });
         serviceDesc.method.forEach((methodDesc, _index) => {
             if (methodDesc.serverStreaming || methodDesc.clientStreaming) {
                 hasStreamingMethods = true;

package/build/options.js

@@ -142,9 +142,15 @@ function optionsFromParameter(parameter) {
     if (typeof options.outputServices == "string") {
         options.outputServices = [options.outputServices];
     }
-    if (options.outputServices.length == 0) {
+    // Assume the user wants the default service output, unless they're using nestJs, which has
+    // its own controllers output (although nestjs users can ask for other services too).
+    if (options.outputServices.length == 0 && !options.nestJs) {
         options.outputServices = [ServiceOption.DEFAULT];
     }
+    // If using nestJs + other services, add the encode methods back
+    if (options.nestJs && options.outputServices.length > 0) {
+        options.outputEncodeMethods = true;
+    }
     if (options.useDate === true) {
         // Treat useDate=true as DATE
         options.useDate = DateOption.DATE;

package/package.json

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