ts-proto 1.83.1 → 1.85.0

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+# [1.85.0](https://github.com/stephenh/ts-proto/compare/v1.84.0...v1.85.0) (2021-11-02)
+
+
+### Features
+
+* Streaming support ([#373](https://github.com/stephenh/ts-proto/issues/373)) ([459b94f](https://github.com/stephenh/ts-proto/commit/459b94f5b2988d58d186461332e888c3e511603a))
+
+# [1.84.0](https://github.com/stephenh/ts-proto/compare/v1.83.3...v1.84.0) (2021-11-02)
+
+
+### Features
+
+* Reduce code size by using nullish coalescing operator in fromPartial ([#376](https://github.com/stephenh/ts-proto/issues/376)) ([19d2ded](https://github.com/stephenh/ts-proto/commit/19d2deda2cf7c47b1b56bfc65cf58653291dba4a))
+
+## [1.83.3](https://github.com/stephenh/ts-proto/compare/v1.83.2...v1.83.3) (2021-10-28)
+
+
+### Bug Fixes
+
+* fix codegen for maps with wrapper value type ([#370](https://github.com/stephenh/ts-proto/issues/370)) ([dd2481d](https://github.com/stephenh/ts-proto/commit/dd2481df0835faafc561aad4a4d0c9c2ff9d868a))
+
+## [1.83.2](https://github.com/stephenh/ts-proto/compare/v1.83.1...v1.83.2) (2021-10-26)
+
+
+### Bug Fixes
+
+* Add missing defaults to fromPartial if options.oneof is UNIONS ([#375](https://github.com/stephenh/ts-proto/issues/375)) ([21781e9](https://github.com/stephenh/ts-proto/commit/21781e98bb6117b540be8c3f2c38ac3ad5cbbb44))
+
 ## [1.83.1](https://github.com/stephenh/ts-proto/compare/v1.83.0...v1.83.1) (2021-09-17)
 
 

package/build/generate-grpc-web.js

@@ -43,9 +43,7 @@ function generateRpcMethod(ctx, serviceDesc, methodDesc) {
     const { options, utils } = ctx;
     const inputType = types_1.requestType(ctx, methodDesc);
     const partialInputType = ts_poet_1.code `${utils.DeepPartial}<${inputType}>`;
-    const returns = options.returnObservable || methodDesc.serverStreaming
-        ? types_1.responseObservable(ctx, methodDesc)
-        : types_1.responsePromise(ctx, methodDesc);
+    const returns = types_1.responsePromiseOrObservable(ctx, methodDesc);
     const method = methodDesc.serverStreaming ? 'invoke' : 'unary';
     return ts_poet_1.code `
     ${methodDesc.formattedName}(

package/build/generate-services.js

@@ -55,15 +55,7 @@ function generateService(ctx, fileDesc, sourceInfo, serviceDesc) {
         if (options.addNestjsRestParameter) {
             params.push(ts_poet_1.code `...rest: any`);
         }
-        // Return observable for interface only configuration, passing returnObservable=true and methodDesc.serverStreaming=true
-        let returnType;
-        if (options.returnObservable || methodDesc.serverStreaming) {
-            returnType = types_1.responseObservable(ctx, methodDesc);
-        }
-        else {
-            returnType = types_1.responsePromise(ctx, methodDesc);
-        }
-        chunks.push(ts_poet_1.code `${methodDesc.formattedName}(${ts_poet_1.joinCode(params, { on: ',' })}): ${returnType};`);
+        chunks.push(ts_poet_1.code `${methodDesc.formattedName}(${ts_poet_1.joinCode(params, { on: ',' })}): ${types_1.responsePromiseOrObservable(ctx, methodDesc)};`);
         // If this is a batch method, auto-generate the singular version of it
         if (options.context) {
             const batchMethod = types_1.detectBatchMethod(ctx, fileDesc, serviceDesc, methodDesc);
@@ -83,22 +75,50 @@ function generateRegularRpcMethod(ctx, fileDesc, serviceDesc, methodDesc) {
     utils_1.assertInstanceOf(methodDesc, utils_1.FormattedMethodDescriptor);
     const { options } = ctx;
     const Reader = ts_poet_1.imp('Reader@protobufjs/minimal');
+    const rawInputType = types_1.rawRequestType(ctx, methodDesc);
     const inputType = types_1.requestType(ctx, methodDesc);
     const outputType = types_1.responseType(ctx, methodDesc);
     const params = [...(options.context ? [ts_poet_1.code `ctx: Context`] : []), ts_poet_1.code `request: ${inputType}`];
     const maybeCtx = options.context ? 'ctx,' : '';
+    let encode = ts_poet_1.code `${rawInputType}.encode(request).finish()`;
+    let decode = ts_poet_1.code `data => ${outputType}.decode(new ${Reader}(data))`;
+    if (methodDesc.clientStreaming) {
+        encode = ts_poet_1.code `request.pipe(${ts_poet_1.imp('map@rxjs/operators')}(request => ${encode}))`;
+    }
+    let returnVariable;
+    if (options.returnObservable || methodDesc.serverStreaming) {
+        returnVariable = 'result';
+        decode = ts_poet_1.code `result.pipe(${ts_poet_1.imp('map@rxjs/operators')}(${decode}))`;
+    }
+    else {
+        returnVariable = 'promise';
+        decode = ts_poet_1.code `promise.then(${decode})`;
+    }
+    let rpcMethod;
+    if (methodDesc.clientStreaming && methodDesc.serverStreaming) {
+        rpcMethod = 'bidirectionalStreamingRequest';
+    }
+    else if (methodDesc.serverStreaming) {
+        rpcMethod = 'serverStreamingRequest';
+    }
+    else if (methodDesc.clientStreaming) {
+        rpcMethod = 'clientStreamingRequest';
+    }
+    else {
+        rpcMethod = 'request';
+    }
     return ts_poet_1.code `
     ${methodDesc.formattedName}(
       ${ts_poet_1.joinCode(params, { on: ',' })}
-    ): ${types_1.responsePromise(ctx, methodDesc)} {
-      const data = ${inputType}.encode(request).finish();
-      const promise = this.rpc.request(
+    ): ${types_1.responsePromiseOrObservable(ctx, methodDesc)} {
+      const data = ${encode};
+      const ${returnVariable} = this.rpc.${rpcMethod}(
         ${maybeCtx}
         "${utils_1.maybePrefixPackage(fileDesc, serviceDesc.name)}",
         "${methodDesc.name}",
         data
       );
-      return promise.then(data => ${outputType}.decode(new ${Reader}(data)));
+      return ${decode};
     }
   `;
 }
@@ -217,24 +237,41 @@ function generateCachingRpcMethod(ctx, fileDesc, serviceDesc, methodDesc) {
  *
  * This lets clients pass in their own request-promise-ish client.
  *
+ * This also requires clientStreamingRequest, serverStreamingRequest and
+ * bidirectionalStreamingRequest methods if any of the RPCs is streaming.
+ *
  * We don't export this because if a project uses multiple `*.proto` files,
  * we don't want our the barrel imports in `index.ts` to have multiple `Rpc`
  * types.
  */
-function generateRpcType(ctx) {
+function generateRpcType(ctx, hasStreamingMethods) {
     const { options } = ctx;
     const maybeContext = options.context ? '<Context>' : '';
     const maybeContextParam = options.context ? 'ctx: Context,' : '';
-    return ts_poet_1.code `
-    interface Rpc${maybeContext} {
-      request(
+    const methods = [[ts_poet_1.code `request`, ts_poet_1.code `Uint8Array`, ts_poet_1.code `Promise<Uint8Array>`]];
+    if (hasStreamingMethods) {
+        const observable = ts_poet_1.imp('Observable@rxjs');
+        methods.push([ts_poet_1.code `clientStreamingRequest`, ts_poet_1.code `${observable}<Uint8Array>`, ts_poet_1.code `Promise<Uint8Array>`]);
+        methods.push([ts_poet_1.code `serverStreamingRequest`, ts_poet_1.code `Uint8Array`, ts_poet_1.code `${observable}<Uint8Array>`]);
+        methods.push([
+            ts_poet_1.code `bidirectionalStreamingRequest`,
+            ts_poet_1.code `${observable}<Uint8Array>`,
+            ts_poet_1.code `${observable}<Uint8Array>`,
+        ]);
+    }
+    const chunks = [];
+    chunks.push(ts_poet_1.code `    interface Rpc${maybeContext} {`);
+    methods.forEach((method) => {
+        chunks.push(ts_poet_1.code `
+      ${method[0]}(
         ${maybeContextParam}
         service: string,
         method: string,
-        data: Uint8Array
-      ): Promise<Uint8Array>;
-    }
-  `;
+        data: ${method[1]}
+      ): ${method[2]};`);
+    });
+    chunks.push(ts_poet_1.code `    }`);
+    return ts_poet_1.joinCode(chunks, { on: '\n' });
 }
 exports.generateRpcType = generateRpcType;
 function generateDataLoadersType() {

package/build/main.js

@@ -91,6 +91,7 @@ function generateFile(ctx, fileDesc) {
             }
         }, options);
     }
+    let hasServerStreamingMethods = false;
     let hasStreamingMethods = false;
     visit_1.visitServices(fileDesc, sourceInfo, (serviceDesc, sInfo) => {
         if (options.nestJs) {
@@ -126,18 +127,23 @@ function generateFile(ctx, fileDesc) {
                 serviceDesc.method.forEach((method) => {
                     chunks.push(generate_grpc_web_1.generateGrpcMethodDesc(ctx, serviceDesc, method));
                     if (method.serverStreaming) {
-                        hasStreamingMethods = true;
+                        hasServerStreamingMethods = true;
                     }
                 });
             }
         }
+        serviceDesc.method.forEach((methodDesc, index) => {
+            if (methodDesc.serverStreaming || methodDesc.clientStreaming) {
+                hasStreamingMethods = true;
+            }
+        });
     });
     if (options.outputServices === options_1.ServiceOption.DEFAULT && options.outputClientImpl && fileDesc.service.length > 0) {
         if (options.outputClientImpl === true) {
-            chunks.push(generate_services_1.generateRpcType(ctx));
+            chunks.push(generate_services_1.generateRpcType(ctx, hasStreamingMethods));
         }
         else if (options.outputClientImpl === 'grpc-web') {
-            chunks.push(generate_grpc_web_1.addGrpcWebMisc(ctx, hasStreamingMethods));
+            chunks.push(generate_grpc_web_1.addGrpcWebMisc(ctx, hasServerStreamingMethods));
         }
     }
     if (options.context) {
@@ -632,10 +638,18 @@ function generateEncode(ctx, fullName, messageDesc) {
         }
         if (types_1.isRepeated(field)) {
             if (types_1.isMapType(ctx, messageDesc, field)) {
+                const valueType = typeMap.get(field.typeName)[2].field[1];
                 const maybeTypeField = options.outputTypeRegistry ? `$type: '${field.typeName.slice(1)}',` : '';
+                const entryWriteSnippet = types_1.isValueType(ctx, valueType)
+                    ? ts_poet_1.code `
+              if (value !== undefined) {
+                ${writeSnippet(`{ ${maybeTypeField} key: key as any, value }`)};
+              }
+            `
+                    : writeSnippet(`{ ${maybeTypeField} key: key as any, value }`);
                 chunks.push(ts_poet_1.code `
           Object.entries(message.${fieldName}).forEach(([key, value]) => {
-            ${writeSnippet(`{ ${maybeTypeField} key: key as any, value }`)};
+            ${entryWriteSnippet}
           });
         `);
             }
@@ -814,6 +828,10 @@ function generateFromJson(ctx, fullName, messageDesc) {
                         (options.useDate === options_1.DateOption.DATE || options.useDate === options_1.DateOption.TIMESTAMP)) {
                         return ts_poet_1.code `${utils.fromJsonTimestamp}(${from})`;
                     }
+                    else if (types_1.isValueType(ctx, valueType)) {
+                        const type = types_1.basicTypeName(ctx, valueType);
+                        return ts_poet_1.code `${from} as ${type}`;
+                    }
                     else {
                         const type = types_1.basicTypeName(ctx, valueType);
                         return ts_poet_1.code `${type}.fromJSON(${from})`;
@@ -917,7 +935,7 @@ function generateToJson(ctx, fullName, messageDesc) {
                 else if (types_1.isTimestamp(valueType) && options.useDate === options_1.DateOption.TIMESTAMP) {
                     return ts_poet_1.code `${utils.fromTimestamp}(${from}).toISOString()`;
                 }
-                else if (types_1.isScalar(valueType)) {
+                else if (types_1.isScalar(valueType) || types_1.isValueType(ctx, valueType)) {
                     return ts_poet_1.code `${from}`;
                 }
                 else {
@@ -990,12 +1008,6 @@ function generateFromPartial(ctx, fullName, messageDesc) {
     fromPartial(${messageDesc.field.length > 0 ? 'object' : '_'}: ${utils.DeepPartial}<${fullName}>): ${fullName} {
       const message = { ...base${fullName} } as ${fullName};
   `);
-    // initialize all lists
-    messageDesc.field.filter(types_1.isRepeated).forEach((field) => {
-        const value = types_1.isMapType(ctx, messageDesc, field) ? '{}' : '[]';
-        const name = case_1.maybeSnakeToCamel(field.name, options);
-        chunks.push(ts_poet_1.code `message.${name} = ${value};`);
-    });
     // add a check for each incoming field
     messageDesc.field.forEach((field) => {
         const fieldName = case_1.maybeSnakeToCamel(field.name, options);
@@ -1024,6 +1036,9 @@ function generateFromPartial(ctx, fullName, messageDesc) {
                         (options.useDate === options_1.DateOption.DATE || options.useDate === options_1.DateOption.STRING)) {
                         return ts_poet_1.code `${from}`;
                     }
+                    else if (types_1.isValueType(ctx, valueType)) {
+                        return ts_poet_1.code `${from}`;
+                    }
                     else {
                         const type = types_1.basicTypeName(ctx, valueType);
                         return ts_poet_1.code `${type}.fromPartial(${from})`;
@@ -1040,6 +1055,9 @@ function generateFromPartial(ctx, fullName, messageDesc) {
         };
         // and then use the snippet to handle repeated fields if necessary
         if (types_1.isRepeated(field)) {
+            const value = types_1.isMapType(ctx, messageDesc, field) ? '{}' : '[]';
+            const name = case_1.maybeSnakeToCamel(field.name, options);
+            chunks.push(ts_poet_1.code `message.${name} = ${value};`);
             chunks.push(ts_poet_1.code `if (object.${fieldName} !== undefined && object.${fieldName} !== null) {`);
             if (types_1.isMapType(ctx, messageDesc, field)) {
                 const i = maybeCastToNumber(ctx, messageDesc, field, 'key');
@@ -1058,6 +1076,7 @@ function generateFromPartial(ctx, fullName, messageDesc) {
           }
         `);
             }
+            chunks.push(ts_poet_1.code `}`);
         }
         else if (types_1.isWithinOneOfThatShouldBeUnion(options, field)) {
             let oneofName = case_1.maybeSnakeToCamel(messageDesc.oneofDecl[field.oneofIndex].name, options);
@@ -1069,25 +1088,34 @@ function generateFromPartial(ctx, fullName, messageDesc) {
           && object.${oneofName}?.${fieldName} !== null
         ) {
           message.${oneofName} = { $case: '${fieldName}', ${fieldName}: ${v} };
+        }  
       `);
         }
-        else {
+        else if ((types_1.isLong(field) || types_1.isLongValueType(field)) && options.forceLong === options_1.LongOption.LONG) {
+            const v = readSnippet(`object.${fieldName}`);
+            const type = types_1.basicTypeName(ctx, field);
             chunks.push(ts_poet_1.code `if (object.${fieldName} !== undefined && object.${fieldName} !== null) {`);
-            if ((types_1.isLong(field) || types_1.isLongValueType(field)) && options.forceLong === options_1.LongOption.LONG) {
-                const v = readSnippet(`object.${fieldName}`);
-                const type = types_1.basicTypeName(ctx, field);
-                chunks.push(ts_poet_1.code `message.${fieldName} = ${v} as ${type};`);
-            }
-            else {
-                chunks.push(ts_poet_1.code `message.${fieldName} = ${readSnippet(`object.${fieldName}`)};`);
-            }
+            chunks.push(ts_poet_1.code `message.${fieldName} = ${v} as ${type};`);
+            chunks.push(ts_poet_1.code `} else {`);
+            const fallback = types_1.isWithinOneOf(field) ? 'undefined' : types_1.defaultValue(ctx, field);
+            chunks.push(ts_poet_1.code `message.${fieldName} = ${fallback}`);
+            chunks.push(ts_poet_1.code `}`);
         }
-        if (!types_1.isRepeated(field) && options.oneof !== options_1.OneofOption.UNIONS) {
+        else if (types_1.isPrimitive(field) ||
+            (types_1.isTimestamp(field) && (options.useDate === options_1.DateOption.DATE || options.useDate === options_1.DateOption.STRING)) ||
+            types_1.isValueType(ctx, field)) {
+            // An optimized case of the else below that works when `readSnippet` returns the plain input
+            const fallback = types_1.isWithinOneOf(field) ? 'undefined' : types_1.defaultValue(ctx, field);
+            chunks.push(ts_poet_1.code `message.${fieldName} = object.${fieldName} ?? ${fallback};`);
+        }
+        else {
+            chunks.push(ts_poet_1.code `if (object.${fieldName} !== undefined && object.${fieldName} !== null) {`);
+            chunks.push(ts_poet_1.code `message.${fieldName} = ${readSnippet(`object.${fieldName}`)};`);
             chunks.push(ts_poet_1.code `} else {`);
-            const v = types_1.isWithinOneOf(field) ? 'undefined' : types_1.defaultValue(ctx, field);
-            chunks.push(ts_poet_1.code `message.${fieldName} = ${v}`);
+            const fallback = types_1.isWithinOneOf(field) ? 'undefined' : types_1.defaultValue(ctx, field);
+            chunks.push(ts_poet_1.code `message.${fieldName} = ${fallback}`);
+            chunks.push(ts_poet_1.code `}`);
         }
-        chunks.push(ts_poet_1.code `}`);
     });
     // and then wrap up the switch/while/return
     chunks.push(ts_poet_1.code `return message;`);

package/build/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.detectBatchMethod = exports.responseObservable = exports.responsePromise = exports.responseType = exports.requestType = exports.detectMapType = exports.toTypeName = exports.getEnumMethod = exports.messageToTypeName = exports.wrapperTypeName = exports.valueTypeName = exports.isEmptyType = exports.isLongValueType = exports.isBytesValueType = exports.isValueType = exports.isTimestamp = exports.isMapType = exports.isLong = exports.isRepeated = exports.isWithinOneOfThatShouldBeUnion = exports.isWithinOneOf = exports.isEnum = exports.isMessage = exports.isBytes = exports.isPrimitive = exports.isScalar = exports.createTypeMap = exports.notDefaultCheck = exports.defaultValue = exports.packedType = exports.toReaderCall = exports.basicTypeName = exports.basicLongWireType = exports.basicWireType = void 0;
+exports.detectBatchMethod = exports.responsePromiseOrObservable = exports.responseObservable = exports.responsePromise = exports.responseType = exports.requestType = exports.rawRequestType = exports.detectMapType = exports.toTypeName = exports.getEnumMethod = exports.messageToTypeName = exports.wrapperTypeName = exports.valueTypeName = exports.isEmptyType = exports.isLongValueType = exports.isBytesValueType = exports.isValueType = exports.isTimestamp = exports.isMapType = exports.isLong = exports.isRepeated = exports.isWithinOneOfThatShouldBeUnion = exports.isWithinOneOf = exports.isEnum = exports.isMessage = exports.isBytes = exports.isPrimitive = exports.isScalar = exports.createTypeMap = exports.notDefaultCheck = exports.defaultValue = exports.packedType = exports.toReaderCall = exports.basicTypeName = exports.basicLongWireType = exports.basicWireType = void 0;
 const ts_proto_descriptors_1 = require("ts-proto-descriptors");
 const ts_poet_1 = require("ts-poet");
 const options_1 = require("./options");
@@ -512,8 +512,12 @@ function detectMapType(ctx, messageDesc, fieldDesc) {
     return undefined;
 }
 exports.detectMapType = detectMapType;
+function rawRequestType(ctx, methodDesc) {
+    return messageToTypeName(ctx, methodDesc.inputType);
+}
+exports.rawRequestType = rawRequestType;
 function requestType(ctx, methodDesc) {
-    let typeName = messageToTypeName(ctx, methodDesc.inputType);
+    let typeName = rawRequestType(ctx, methodDesc);
     if (methodDesc.clientStreaming) {
         return ts_poet_1.code `${ts_poet_1.imp('Observable@rxjs')}<${typeName}>`;
     }
@@ -532,6 +536,14 @@ function responseObservable(ctx, methodDesc) {
     return ts_poet_1.code `${ts_poet_1.imp('Observable@rxjs')}<${responseType(ctx, methodDesc)}>`;
 }
 exports.responseObservable = responseObservable;
+function responsePromiseOrObservable(ctx, methodDesc) {
+    const { options } = ctx;
+    if (options.returnObservable || methodDesc.serverStreaming) {
+        return responseObservable(ctx, methodDesc);
+    }
+    return responsePromise(ctx, methodDesc);
+}
+exports.responsePromiseOrObservable = responsePromiseOrObservable;
 function detectBatchMethod(ctx, fileDesc, serviceDesc, methodDesc) {
     const { typeMap } = ctx;
     const nameMatches = methodDesc.name.startsWith('Batch');

package/package.json

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