ts-proto 1.105.0 → 1.105.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.105.1](https://github.com/stephenh/ts-proto/compare/v1.105.0...v1.105.1) (2022-02-14)
+
+
+### Bug Fixes
+
+* generate canonical JSON encoding for FieldMasks ([#510](https://github.com/stephenh/ts-proto/issues/510)) ([0ec4e97](https://github.com/stephenh/ts-proto/commit/0ec4e97a2649dc15af1c925f8a2ff6adf1e17d9b))
+
 # [1.105.0](https://github.com/stephenh/ts-proto/compare/v1.104.1...v1.105.0) (2022-02-12)
 
 

package/README.markdown

@@ -331,7 +331,7 @@ Generated code will be placed in the Gradle build directory.
 
   (Note that this only uses the grpc-web runtime, you don't need to use any of their generated code, i.e. the ts-proto output replaces their `ts-protoc-gen` output.)
 
-  You'll need to add the `@improbable-eng/grpc-web` and a transport to your project's `package.json`; see the `integration/grpc-web` directory for a working example.
+  You'll need to add the `@improbable-eng/grpc-web` and a transport to your project's `package.json`; see the `integration/grpc-web` directory for a working example. Also see [#504](https://github.com/stephenh/ts-proto/issues/504) for integrating with [grpc-web-devtools](https://github.com/SafetyCulture/grpc-web-devtools).
 
 - With `--ts_proto_opt=returnObservable=true`, the return type of service methods will be `Observable<T>` instead of `Promise<T>`.
 

package/build/main.js

@@ -934,6 +934,9 @@ function generateFromJson(ctx, fullName, messageDesc) {
             else if (types_1.isAnyValueType(field) || types_1.isStructType(field)) {
                 return ts_poet_1.code `${from}`;
             }
+            else if (types_1.isFieldMaskType(field)) {
+                return ts_poet_1.code `{paths: ${from}.split(",")}`;
+            }
             else if (types_1.isListValueType(field)) {
                 return ts_poet_1.code `[...${from}]`;
             }
@@ -1151,6 +1154,9 @@ function generateToJson(ctx, fullName, messageDesc) {
             else if (types_1.isAnyValueType(field)) {
                 return ts_poet_1.code `${from}`;
             }
+            else if (types_1.isFieldMaskType(field)) {
+                return ts_poet_1.code `${from}.paths.join()`;
+            }
             else if (types_1.isMessage(field) && !types_1.isValueType(ctx, field) && !types_1.isMapType(ctx, messageDesc, field)) {
                 const type = types_1.basicTypeName(ctx, field, { keepValueType: true });
                 return ts_poet_1.code `${from} ? ${type}.toJSON(${from}) : ${types_1.defaultValue(ctx, field)}`;
@@ -1323,7 +1329,7 @@ function generateFromPartial(ctx, fullName, messageDesc) {
           && object.${oneofName}?.${fieldName} !== null
         ) {
           message.${oneofName} = { $case: '${fieldName}', ${fieldName}: ${v} };
-        }  
+        }
       `);
         }
         else if (readSnippet(`x`).toCodeString() == 'x') {
@@ -1362,7 +1368,7 @@ function generateWrap(ctx, fullProtoTypeName) {
         if (ctx.options.oneof === options_1.OneofOption.UNIONS) {
             chunks.push(ts_poet_1.code `wrap(value: any): Value {
         const result = createBaseValue();
-        
+
         if (value === null) {
           result.kind = {$case: 'nullValue', nullValue: NullValue.NULL_VALUE};
         } else if (typeof value === 'boolean') {

package/build/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.isStructTypeName = exports.isStructType = exports.isListValueTypeName = exports.isListValueType = exports.isBytesValueType = exports.isAnyValueTypeName = exports.isAnyValueType = exports.isValueType = exports.isTimestamp = exports.isObjectId = exports.isMapType = exports.isWholeNumber = exports.isLong = exports.isRepeated = exports.isWithinOneOfThatShouldBeUnion = exports.isWithinOneOf = exports.isEnum = exports.isMessage = exports.isBytes = exports.isPrimitive = exports.isOptionalProperty = 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.isStructTypeName = exports.isStructType = exports.isListValueTypeName = exports.isListValueType = exports.isFieldMaskTypeName = exports.isFieldMaskType = exports.isBytesValueType = exports.isAnyValueTypeName = exports.isAnyValueType = exports.isValueType = exports.isTimestamp = exports.isObjectId = exports.isMapType = exports.isWholeNumber = exports.isLong = exports.isRepeated = exports.isWithinOneOfThatShouldBeUnion = exports.isWithinOneOf = exports.isEnum = exports.isMessage = exports.isBytes = exports.isPrimitive = exports.isOptionalProperty = 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");
@@ -403,6 +403,14 @@ function isBytesValueType(field) {
     return field.typeName === '.google.protobuf.BytesValue';
 }
 exports.isBytesValueType = isBytesValueType;
+function isFieldMaskType(field) {
+    return isFieldMaskTypeName(field.typeName);
+}
+exports.isFieldMaskType = isFieldMaskType;
+function isFieldMaskTypeName(typeName) {
+    return typeName === 'google.protobuf.FieldMask' || typeName === '.google.protobuf.FieldMask';
+}
+exports.isFieldMaskTypeName = isFieldMaskTypeName;
 function isListValueType(field) {
     return isListValueTypeName(field.typeName);
 }

package/package.json

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