ts-proto 1.107.0 → 1.109.1

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [1.109.1](https://github.com/stephenh/ts-proto/compare/v1.109.0...v1.109.1) (2022-03-13)
+
+
+### Bug Fixes
+
+* Type Error when map contains string enums [#382](https://github.com/stephenh/ts-proto/issues/382) ([#529](https://github.com/stephenh/ts-proto/issues/529)) ([c2107b9](https://github.com/stephenh/ts-proto/commit/c2107b96b494a500a4773ac04900a1acd13c507a))
+
+# [1.109.0](https://github.com/stephenh/ts-proto/compare/v1.108.0...v1.109.0) (2022-03-13)
+
+
+### Features
+
+* import proto as type import if onlyTypes is set ([25d8e8b](https://github.com/stephenh/ts-proto/commit/25d8e8b9042142f1032feadc8a799b7a01115cc2))
+
+# [1.108.0](https://github.com/stephenh/ts-proto/compare/v1.107.0...v1.108.0) (2022-03-07)
+
+
+### Features
+
+* represent field masks as `string[]` ([#525](https://github.com/stephenh/ts-proto/issues/525)) ([903b216](https://github.com/stephenh/ts-proto/commit/903b216238db025e24ec3cfb2d20063aec1a40ed))
+
 # [1.107.0](https://github.com/stephenh/ts-proto/compare/v1.106.2...v1.107.0) (2022-03-04)
 
 

package/README.markdown

@@ -622,24 +622,19 @@ Their interpretation is defined by the Protobuf specification, and libraries are
 
 `ts-proto` currently automatically converts these messages to their corresponding native types.
 
-- Wrapper Types:
-
-  * [google.protobuf.DoubleValue](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#DoubleValue) ⇆ `number | undefined`
-  * [google.protobuf.FloatValue](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#FloatValue) ⇆ `number | undefined`
-  * [google.protobuf.Int64Value](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#Int64Value) ⇆ `number | undefined`
-  * [google.protobuf.UInt64Value](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#UInt64Value) ⇆ `number | undefined`
-  * [google.protobuf.Int32Value](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#Int32Value) ⇆ `number | undefined`
-  * [google.protobuf.UInt32Value](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#UInt32Value) ⇆ `number | undefined`
-  * [google.protobuf.BoolValue](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#BoolValue) ⇆ `boolean | undefined`
-  * [google.protobuf.StringValue](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#StringValue) ⇆ `string | undefined`
-  * [google.protobuf.BytesValue](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#google.protobuf.BytesValue) ⇆ `Uint8Array | undefined`
-
-- JSON Types (Struct Types):
-
-  * [google.protobuf.Value](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#Value)  ⇆ `any | undefined` (i.e. `number | string | boolean | null | array | object`)
-  * [google.protobuf.ListValue](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#ListValue) ⇆ `any[]`
-  * [google.protobuf.Struct](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#Struct) ⇆ `{ [key: string]: any } | undefined`
-  * [google.protobuf.FieldMask](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask) ⇆ `string[]` (only in the JSON, `FieldMask` is still a message)
+ * [google.protobuf.BoolValue](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#boolvalue) ⇆ `boolean`
+ * [google.protobuf.BytesValue](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#bytesvalue) ⇆ `Uint8Array`
+ * [google.protobuf.DoubleValue](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#doublevalue) ⇆ `number`
+ * [google.protobuf.FieldMask](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask) ⇆ `string[]`
+ * [google.protobuf.FloatValue](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#floatvalue) ⇆ `number`
+ * [google.protobuf.Int32Value](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#int32value) ⇆ `number`
+ * [google.protobuf.Int64Value](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#int64value) ⇆ `number`
+ * [google.protobuf.ListValue](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#listvalue) ⇆ `any[]`
+ * [google.protobuf.UInt32Value](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#uint32value) ⇆ `number`
+ * [google.protobuf.UInt64Value](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#uint64value) ⇆ `number`
+ * [google.protobuf.StringValue](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#stringvalue) ⇆ `string`
+ * [google.protobuf.Value](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#value)  ⇆ `any` (i.e. `number | string | boolean | null | array | object`)
+ * [google.protobuf.Struct](https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#struct) ⇆ `{ [key: string]: any }`
 
 ## Wrapper Types
 

package/build/main.js

@@ -80,8 +80,8 @@ function generateFile(ctx, fileDesc) {
                 staticMembers.push(generateDecode(ctx, fullName, message));
             }
             if (options.outputJsonMethods) {
-                staticMembers.push(generateFromJson(ctx, fullName, message));
-                staticMembers.push(generateToJson(ctx, fullName, message));
+                staticMembers.push(generateFromJson(ctx, fullName, fullTypeName, message));
+                staticMembers.push(generateToJson(ctx, fullName, fullTypeName, message));
             }
             if (options.outputPartialMethods) {
                 staticMembers.push(generateFromPartial(ctx, fullName, message));
@@ -604,7 +604,7 @@ function generateDecode(ctx, fullName, messageDesc) {
         else if (types_1.isValueType(ctx, field)) {
             const type = types_1.basicTypeName(ctx, field, { keepValueType: true });
             const unwrap = (decodedValue) => {
-                if (types_1.isListValueType(field) || types_1.isStructType(field) || types_1.isAnyValueType(field)) {
+                if (types_1.isListValueType(field) || types_1.isStructType(field) || types_1.isAnyValueType(field) || types_1.isFieldMaskType(field)) {
                     return ts_poet_1.code `${type}.unwrap(${decodedValue})`;
                 }
                 return ts_poet_1.code `${decodedValue}.value`;
@@ -729,7 +729,7 @@ function generateEncode(ctx, fullName, messageDesc) {
             const maybeTypeField = options.outputTypeRegistry ? `$type: '${field.typeName.slice(1)}',` : '';
             const type = types_1.basicTypeName(ctx, field, { keepValueType: true });
             const wrappedValue = (place) => {
-                if (types_1.isAnyValueType(field) || types_1.isListValueType(field) || types_1.isStructType(field)) {
+                if (types_1.isAnyValueType(field) || types_1.isListValueType(field) || types_1.isStructType(field) || types_1.isFieldMaskType(field)) {
                     return ts_poet_1.code `${type}.wrap(${place})`;
                 }
                 return ts_poet_1.code `{${maybeTypeField} value: ${place}!}`;
@@ -887,7 +887,7 @@ function generateEncode(ctx, fullName, messageDesc) {
  * This is very similar to decode, we loop through looking for properties, with
  * a few special cases for https://developers.google.com/protocol-buffers/docs/proto3#json.
  * */
-function generateFromJson(ctx, fullName, messageDesc) {
+function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
     const { options, utils, typeMap } = ctx;
     const chunks = [];
     // create the basic function declaration
@@ -899,8 +899,18 @@ function generateFromJson(ctx, fullName, messageDesc) {
         chunks.push(ts_poet_1.code `$type: ${fullName}.$type,`);
     }
     const oneofFieldsCases = messageDesc.oneofDecl.map((oneof, oneofIndex) => messageDesc.field.filter(types_1.isWithinOneOf).filter((field) => field.oneofIndex === oneofIndex));
+    const canonicalFromJson = {
+        ['google.protobuf.FieldMask']: {
+            paths: (from) => ts_poet_1.code `typeof(${from}) === 'string'
+        ? ${from}.split(",").filter(Boolean)
+        : Array.isArray(${from}?.paths)
+        ? ${from}.paths.map(String)
+        : []`,
+        },
+    };
     // add a check for each incoming field
     messageDesc.field.forEach((field) => {
+        var _a;
         const fieldName = case_1.maybeSnakeToCamel(field.name, options);
         const jsonName = utils_1.getFieldJsonName(field, options);
         const jsonProperty = utils_1.getPropertyAccessor('object', jsonName);
@@ -944,7 +954,8 @@ function generateFromJson(ctx, fullName, messageDesc) {
                 return ts_poet_1.code `${from}`;
             }
             else if (types_1.isFieldMaskType(field)) {
-                return ts_poet_1.code `{paths: ${from}.split(",")}`;
+                const type = types_1.basicTypeName(ctx, field, { keepValueType: true });
+                return ts_poet_1.code `${type}.unwrap(${type}.fromJSON(${from}))`;
             }
             else if (types_1.isListValueType(field)) {
                 return ts_poet_1.code `[...${from}]`;
@@ -963,10 +974,10 @@ function generateFromJson(ctx, fullName, messageDesc) {
             }
             else if (types_1.isMessage(field)) {
                 if (types_1.isRepeated(field) && types_1.isMapType(ctx, messageDesc, field)) {
-                    const valueType = typeMap.get(field.typeName)[2].field[1];
-                    if (types_1.isPrimitive(valueType)) {
+                    const { valueField, valueType } = types_1.detectMapType(ctx, messageDesc, field);
+                    if (types_1.isPrimitive(valueField)) {
                         // TODO Can we not copy/paste this from ^?
-                        if (types_1.isBytes(valueType)) {
+                        if (types_1.isBytes(valueField)) {
                             if (options.env === options_1.EnvOption.NODE) {
                                 return ts_poet_1.code `Buffer.from(${utils.bytesFromBase64}(${from} as string))`;
                             }
@@ -974,37 +985,35 @@ function generateFromJson(ctx, fullName, messageDesc) {
                                 return ts_poet_1.code `${utils.bytesFromBase64}(${from} as string)`;
                             }
                         }
-                        else if (types_1.isLong(valueType) && options.forceLong === options_1.LongOption.LONG) {
+                        else if (types_1.isLong(valueField) && options.forceLong === options_1.LongOption.LONG) {
                             return ts_poet_1.code `Long.fromValue(${from} as Long | string)`;
                         }
-                        else if (types_1.isEnum(valueType)) {
-                            return ts_poet_1.code `${from} as number`;
+                        else if (types_1.isEnum(valueField)) {
+                            return ts_poet_1.code `${from} as ${valueType}`;
                         }
                         else {
-                            const cstr = case_1.capitalize(types_1.basicTypeName(ctx, valueType).toCodeString());
+                            const cstr = case_1.capitalize(valueType.toCodeString());
                             return ts_poet_1.code `${cstr}(${from})`;
                         }
                     }
-                    else if (types_1.isObjectId(valueType) && options.useMongoObjectId) {
+                    else if (types_1.isObjectId(valueField) && options.useMongoObjectId) {
                         return ts_poet_1.code `${utils.fromJsonObjectId}(${from})`;
                     }
-                    else if (types_1.isTimestamp(valueType) && options.useDate === options_1.DateOption.STRING) {
+                    else if (types_1.isTimestamp(valueField) && options.useDate === options_1.DateOption.STRING) {
                         return ts_poet_1.code `String(${from})`;
                     }
-                    else if (types_1.isTimestamp(valueType) &&
+                    else if (types_1.isTimestamp(valueField) &&
                         (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 if (types_1.isValueType(ctx, valueField)) {
+                        return ts_poet_1.code `${from} as ${valueType}`;
                     }
-                    else if (types_1.isAnyValueType(valueType)) {
+                    else if (types_1.isAnyValueType(valueField)) {
                         return ts_poet_1.code `${from}`;
                     }
                     else {
-                        const type = types_1.basicTypeName(ctx, valueType);
-                        return ts_poet_1.code `${type}.fromJSON(${from})`;
+                        return ts_poet_1.code `${valueType}.fromJSON(${from})`;
                     }
                 }
                 else {
@@ -1017,7 +1026,10 @@ function generateFromJson(ctx, fullName, messageDesc) {
             }
         };
         // and then use the snippet to handle repeated fields if necessary
-        if (types_1.isRepeated(field)) {
+        if ((_a = canonicalFromJson[fullTypeName]) === null || _a === void 0 ? void 0 : _a[fieldName]) {
+            chunks.push(ts_poet_1.code `${fieldName}: ${canonicalFromJson[fullTypeName][fieldName]('object')},`);
+        }
+        else if (types_1.isRepeated(field)) {
             if (types_1.isMapType(ctx, messageDesc, field)) {
                 const fieldType = types_1.toTypeName(ctx, messageDesc, field);
                 const i = maybeCastToNumber(ctx, messageDesc, field, 'key');
@@ -1090,9 +1102,24 @@ function generateFromJson(ctx, fullName, messageDesc) {
     chunks.push(ts_poet_1.code `}`);
     return ts_poet_1.joinCode(chunks, { on: '\n' });
 }
-function generateToJson(ctx, fullName, messageDesc) {
+function generateCanonicalToJson(fullName, fullProtobufTypeName) {
+    if (types_1.isFieldMaskTypeName(fullProtobufTypeName)) {
+        return ts_poet_1.code `
+    toJSON(message: ${fullName}): string {
+      return message.paths.join(',');
+    }
+  `;
+    }
+    return undefined;
+}
+function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
     const { options, utils, typeMap } = ctx;
     const chunks = [];
+    const canonicalToJson = generateCanonicalToJson(fullName, fullProtobufTypeName);
+    if (canonicalToJson) {
+        chunks.push(canonicalToJson);
+        return ts_poet_1.joinCode(chunks, { on: '\n' });
+    }
     // create the basic function declaration
     chunks.push(ts_poet_1.code `
     toJSON(${messageDesc.field.length > 0 ? 'message' : '_'}: ${fullName}): unknown {
@@ -1165,7 +1192,8 @@ function generateToJson(ctx, fullName, messageDesc) {
                 return ts_poet_1.code `${from}`;
             }
             else if (types_1.isFieldMaskType(field)) {
-                return ts_poet_1.code `${from}.paths.join()`;
+                const type = types_1.basicTypeName(ctx, field, { keepValueType: true });
+                return ts_poet_1.code `${type}.toJSON(${type}.wrap(${from}))`;
             }
             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 });
@@ -1263,37 +1291,37 @@ function generateFromPartial(ctx, fullName, messageDesc) {
             }
             else if (types_1.isMessage(field)) {
                 if (types_1.isRepeated(field) && types_1.isMapType(ctx, messageDesc, field)) {
-                    const valueType = typeMap.get(field.typeName)[2].field[1];
-                    if (types_1.isPrimitive(valueType)) {
-                        if (types_1.isBytes(valueType)) {
+                    const { valueField, valueType } = types_1.detectMapType(ctx, messageDesc, field);
+                    if (types_1.isPrimitive(valueField)) {
+                        if (types_1.isBytes(valueField)) {
                             return ts_poet_1.code `${from}`;
                         }
-                        else if (types_1.isEnum(valueType)) {
-                            return ts_poet_1.code `${from} as number`;
+                        else if (types_1.isEnum(valueField)) {
+                            return ts_poet_1.code `${from} as ${valueType}`;
                         }
-                        else if (types_1.isLong(valueType) && options.forceLong === options_1.LongOption.LONG) {
+                        else if (types_1.isLong(valueField) && options.forceLong === options_1.LongOption.LONG) {
                             return ts_poet_1.code `Long.fromValue(${from})`;
                         }
                         else {
-                            const cstr = case_1.capitalize(types_1.basicTypeName(ctx, valueType).toCodeString());
+                            const cstr = case_1.capitalize(valueType.toCodeString());
                             return ts_poet_1.code `${cstr}(${from})`;
                         }
                     }
-                    else if (types_1.isAnyValueType(valueType)) {
+                    else if (types_1.isAnyValueType(valueField)) {
                         return ts_poet_1.code `${from}`;
                     }
-                    else if (types_1.isObjectId(valueType) && options.useMongoObjectId) {
+                    else if (types_1.isObjectId(valueField) && options.useMongoObjectId) {
                         return ts_poet_1.code `${from} as mongodb.ObjectId`;
                     }
-                    else if (types_1.isTimestamp(valueType) &&
+                    else if (types_1.isTimestamp(valueField) &&
                         (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)) {
+                    else if (types_1.isValueType(ctx, valueField)) {
                         return ts_poet_1.code `${from}`;
                     }
                     else {
-                        const type = types_1.basicTypeName(ctx, valueType);
+                        const type = types_1.basicTypeName(ctx, valueField);
                         return ts_poet_1.code `${type}.fromPartial(${from})`;
                     }
                 }
@@ -1431,6 +1459,11 @@ function generateWrap(ctx, fullProtoTypeName) {
       return result;
     }`);
     }
+    if (types_1.isFieldMaskTypeName(fullProtoTypeName)) {
+        chunks.push(ts_poet_1.code `wrap(paths: string[]): FieldMask {
+      return {paths: paths};
+    }`);
+    }
     return chunks;
 }
 function generateUnwrap(ctx, fullProtoTypeName) {
@@ -1488,6 +1521,11 @@ function generateUnwrap(ctx, fullProtoTypeName) {
       return message.values;
     }`);
     }
+    if (types_1.isFieldMaskTypeName(fullProtoTypeName)) {
+        chunks.push(ts_poet_1.code `unwrap(message: FieldMask): string[] {
+      return message.paths;
+    }`);
+    }
     return chunks;
 }
 exports.contextTypeVar = 'Context extends DataLoaders';

package/build/types.js

@@ -458,6 +458,8 @@ function valueTypeName(ctx, typeName) {
             return ts_poet_1.code `any`;
         case '.google.protobuf.Struct':
             return ts_poet_1.code `{[key: string]: any}`;
+        case '.google.protobuf.FieldMask':
+            return ts_poet_1.code `string[]`;
         default:
             return undefined;
     }
@@ -586,10 +588,11 @@ function detectMapType(ctx, messageDesc, fieldDesc) {
         const mapType = typeMap.get(fieldDesc.typeName)[2];
         if (!((_a = mapType.options) === null || _a === void 0 ? void 0 : _a.mapEntry))
             return undefined;
-        const keyType = toTypeName(ctx, messageDesc, mapType.field[0]);
+        const [keyField, valueField] = mapType.field;
+        const keyType = toTypeName(ctx, messageDesc, keyField);
         // use basicTypeName because we don't need the '| undefined'
-        const valueType = basicTypeName(ctx, mapType.field[1]);
-        return { messageDesc: mapType, keyType, valueType };
+        const valueType = basicTypeName(ctx, valueField);
+        return { messageDesc: mapType, keyField, keyType, valueField, valueType };
     }
     return undefined;
 }

package/build/utils.js

@@ -170,6 +170,12 @@ function getPropertyAccessor(objectName, propertyName, optional = false) {
 }
 exports.getPropertyAccessor = getPropertyAccessor;
 function impProto(options, module, type) {
-    return ts_poet_1.imp(`${type}@./${module}${options.fileSuffix}`);
+    const importString = `${type}@./${module}${options.fileSuffix}`;
+    if (options.onlyTypes) {
+        return ts_poet_1.imp('t:' + importString);
+    }
+    else {
+        return ts_poet_1.imp(importString);
+    }
 }
 exports.impProto = impProto;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-proto",
-  "version": "1.107.0",
+  "version": "1.109.1",
   "description": "",
   "main": "build/plugin.js",
   "repository": "github:stephenh/ts-proto",
@@ -11,6 +11,7 @@
     "build": "yarn tsc",
     "build:test": "yarn proto2bin && yarn proto2pbjs && yarn bin2ts",
     "build:test:local": "yarn proto2bin:local && yarn proto2pbjs:local && yarn bin2ts:local",
+    "prepare": "yarn build",
     "proto2bin": "docker-compose run --rm protoc update-bins.sh",
     "proto2bin-node": "docker-compose run --rm node update-bins.sh",
     "proto2pbjs": "docker-compose run --rm protoc pbjs.sh",
@@ -63,7 +64,7 @@
     "dataloader": "^1.4.0",
     "object-hash": "^1.3.1",
     "protobufjs": "^6.8.8",
-    "ts-poet": "^4.5.0",
+    "ts-poet": "^4.10.0",
     "ts-proto-descriptors": "1.6.0"
   }
 }