ts-proto 2.18.0 → 2.18.2

package/README.markdown

@@ -548,7 +548,7 @@ With `--ts_proto_opt=protoJsonFormat=false`, strict proto3 compliance is disable
 
 - With `--ts_proto_opt=useJsonWireFormat=true`, the generated code will reflect the JSON representation of Protobuf messages.
 
-  Requires `onlyTypes=true`. Implies `useDate=string` and `stringEnums=true`. This option is to generate types that can be directly used with marshalling/unmarshalling Protobuf messages serialized as JSON.
+  Requires `onlyTypes=true`. Implies `useDate=string` and `stringEnums=true`, and types `bytes` fields as base64-encoded `string`s. This option is to generate types that can be directly used with marshalling/unmarshalling Protobuf messages serialized as JSON.
   You may also want to set `useOptionals=all`, as gRPC gateways are not required to send default value for scalar values.
 
 - With `--ts_proto_opt=useNumericEnumForJson=true`, the JSON converter (`toJSON`) will encode enum values as int, rather than a string literal.

package/build/src/main.js

@@ -523,10 +523,10 @@ function makeDeepPartial(options, longs) {
     const maybeExcludeType = (0, options_1.addTypeToMessages)(options) ? `| '$type'` : "";
     const Exact = (0, ts_poet_1.conditionalOutput)("Exact", (0, ts_poet_1.code) `
       type KeysOfUnion<T> = T extends T ? keyof T : never;
-      ${maybeExport} type Exact<P, I extends P> = ${maybeUnknownP}P extends ${Builtin}
+      ${maybeExport} type Exact<P, I> = ${maybeUnknownP}P extends ${Builtin}
         ? P
         : P &
-        { [K in keyof P]: Exact<P[K], I[K]> } & { [K in Exclude<keyof I, KeysOfUnion<P> ${maybeExcludeType}>]: never };
+        { [K in keyof P as Extract<K, keyof I>]: Exact<P[K], I[K & keyof I]> } & { [K in Exclude<keyof I, KeysOfUnion<P> ${maybeExcludeType}>]: never };
     `);
     // Based on the type from ts-essentials
     const keys = (0, options_1.addTypeToMessages)(options) ? (0, ts_poet_1.code) `Exclude<keyof T, '$type'>` : (0, ts_poet_1.code) `keyof T`;

package/build/src/types.js

@@ -138,6 +138,9 @@ function basicTypeName(ctx, field, typeOptions = {}) {
             if (options.env === options_1.EnvOption.NODE) {
                 return (0, ts_poet_1.code) `Buffer`;
             }
+            else if (options.useJsonWireFormat) {
+                return (0, ts_poet_1.code) `string`;
+            }
             else {
                 return (0, ts_poet_1.code) `Uint8Array`;
             }
@@ -303,6 +306,9 @@ function defaultValue(ctx, field) {
             if (options.env === options_1.EnvOption.NODE) {
                 return "Buffer.alloc(0)";
             }
+            if (options.useJsonWireFormat) {
+                return '""';
+            }
             return "new Uint8Array(0)";
         case ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_MESSAGE:
         case ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_GROUP:

package/package.json

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