ts-proto 1.90.0 → 1.90.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.90.1](https://github.com/stephenh/ts-proto/compare/v1.90.0...v1.90.1) (2021-11-27)
+
+
+### Bug Fixes
+
+* code-generation for Services with Struct response types ([#407](https://github.com/stephenh/ts-proto/issues/407)) ([f041fa1](https://github.com/stephenh/ts-proto/commit/f041fa1047816748c366bcb81895b6b917eb328d))
+
 # [1.90.0](https://github.com/stephenh/ts-proto/compare/v1.89.0...v1.90.0) (2021-11-24)
 
 

package/build/encode.js

@@ -7,12 +7,20 @@ const options_1 = require("./options");
 function generateEncoder(ctx, typeName) {
     const name = types_1.wrapperTypeName(typeName);
     if (!name) {
-        return ts_poet_1.code `${types_1.messageToTypeName(ctx, typeName)}.encode(value).finish()`;
+        return ts_poet_1.code `${types_1.messageToTypeName(ctx, typeName, { keepValueType: true })}.encode(value).finish()`;
     }
     if (name == 'Timestamp') {
         const TimestampValue = ts_poet_1.imp(`${name}@./google/protobuf/timestamp`);
         return ts_poet_1.code `${TimestampValue}.encode(${ctx.utils.toTimestamp}(value)).finish()`;
     }
+    if (name == 'Struct') {
+        const StructType = ts_poet_1.imp(`${name}@./google/protobuf/struct`);
+        return ts_poet_1.code `${StructType}.encode(${StructType}.wrap(value)).finish()`;
+    }
+    if (name == 'ListValue') {
+        const ListValueType = ts_poet_1.imp(`${name}@./google/protobuf/struct`);
+        return ts_poet_1.code `${ListValueType}.encode({values: value ?? []}).finish()`;
+    }
     const TypeValue = ts_poet_1.imp(`${name}@./google/protobuf/wrappers`);
     switch (name) {
         case 'StringValue':
@@ -32,8 +40,6 @@ function generateEncoder(ctx, typeName) {
             return ts_poet_1.code `${TypeValue}.encode({value: value ?? false}).finish()`;
         case 'BytesValue':
             return ts_poet_1.code `${TypeValue}.encode({value: value ?? new Uint8Array()}).finish()`;
-        case 'ListValue':
-            return ts_poet_1.code `${TypeValue}.encode({value: value ?? []]}).finish()`;
     }
     throw new Error(`unknown wrapper type: ${name}`);
 }
@@ -41,13 +47,17 @@ exports.generateEncoder = generateEncoder;
 function generateDecoder(ctx, typeName) {
     let name = types_1.wrapperTypeName(typeName);
     if (!name) {
-        return ts_poet_1.code `${types_1.messageToTypeName(ctx, typeName)}.decode(value)`;
+        return ts_poet_1.code `${types_1.messageToTypeName(ctx, typeName, { keepValueType: true })}.decode(value)`;
     }
     let TypeValue;
     if (name == 'Timestamp') {
         TypeValue = ts_poet_1.imp(`${name}@./google/protobuf/timestamp`);
         return ts_poet_1.code `${TypeValue}.decode(value)`;
     }
+    if (name == 'Struct' || name == 'ListValue') {
+        TypeValue = ts_poet_1.imp(`${name}@./google/protobuf/struct`);
+        return ts_poet_1.code `${TypeValue}.unwrap(${TypeValue}.decode(value))`;
+    }
     TypeValue = ts_poet_1.imp(`${name}@./google/protobuf/wrappers`);
     return ts_poet_1.code `${TypeValue}.decode(value).value`;
 }

package/build/main.js

@@ -77,6 +77,8 @@ function generateFile(ctx, fileDesc) {
             if (options.outputPartialMethods) {
                 staticMembers.push(generateFromPartial(ctx, fullName, message));
             }
+            staticMembers.push(...generateWrap(fullTypeName));
+            staticMembers.push(...generateUnwrap(fullTypeName));
             chunks.push(ts_poet_1.code `
           export const ${ts_poet_1.def(fullName)} = {
             ${ts_poet_1.joinCode(staticMembers, { on: ',\n\n' })}
@@ -184,7 +186,6 @@ function makeUtils(options) {
         ...makeDeepPartial(options, longs),
         ...makeTimestampMethods(options, longs),
         ...longs,
-        ...makeWrappingUtils(),
     };
 }
 exports.makeUtils = makeUtils;
@@ -241,57 +242,6 @@ function makeLongUtils(options, bytes) {
     `);
     return { numberToLong, longToNumber, longToString, longInit, Long };
 }
-function makeWrappingUtils() {
-    const wrapAnyValue = ts_poet_1.conditionalOutput('wrapAnyValue', ts_poet_1.code `function wrapAnyValue(value: any): Value {
-    if (value === null) {
-        return {nullValue: 0} as Value;
-      } else if (typeof value === 'boolean') {
-        return {boolValue: value} as Value;
-      } else if (typeof value === 'number') {
-        return {numberValue: value} as Value;
-      } else if (typeof value === 'string') {
-        return {stringValue: value} as Value;
-      } else if (Array.isArray(value)) {
-        return {listValue: value} as Value;
-      } else if (typeof value === 'object') {
-        return {structValue: value} as Value;
-      } else if (typeof value === 'undefined') {
-        return {} as Value;
-      } else {
-        throw new Error('Unsupported any value type: ' + typeof value);
-      }
-  }`);
-    const unwrapAnyValue = ts_poet_1.conditionalOutput('unwrapAnyValue', ts_poet_1.code `function unwrapAnyValue(value: Value): string | number | boolean | Object | null | Array<any> | undefined {
-    if (value.stringValue !== undefined) {
-      return value.stringValue;
-    } else if (value.numberValue !== undefined) {
-      return value.numberValue;
-    } else if (value.boolValue !== undefined) {
-      return value.boolValue;
-    } else if (value.structValue !== undefined) {
-      return value.structValue;
-    } else if (value.listValue !== undefined) {
-        return value.listValue;
-    } else if (value.nullValue !== undefined) {
-      return null;
-    }
-  }`);
-    const wrapStruct = ts_poet_1.conditionalOutput('wrapStruct', ts_poet_1.code `function wrapStruct(object: {[key: string]: any}): Struct {
-    const struct = Struct.fromPartial({});
-    Object.keys(object).forEach(key => {
-      struct.fields[key] = object[key];
-    });
-    return struct;
-  }`);
-    const unwrapStruct = ts_poet_1.conditionalOutput('unwrapStruct', ts_poet_1.code `function unwrapStruct(struct: Struct): {[key: string]: any} {
-    const object: { [key: string]: any } = {};
-    Object.keys(struct.fields).forEach(key => {
-      object[key] = struct.fields[key];
-    });
-    return object;
-  }`);
-    return { wrapAnyValue, unwrapAnyValue, wrapStruct, unwrapStruct };
-}
 function makeByteUtils() {
     const globalThis = ts_poet_1.conditionalOutput('globalThis', ts_poet_1.code `
       declare var self: any | undefined;
@@ -580,16 +530,13 @@ 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.isAnyValueType(field))
-                    return ts_poet_1.code `${ctx.utils.unwrapAnyValue}(${decodedValue})`;
-                if (types_1.isStructType(field))
-                    return ts_poet_1.code `${ctx.utils.unwrapStruct}(${decodedValue})`;
-                if (types_1.isListValueType(field))
-                    return ts_poet_1.code `${decodedValue}.values`;
+                if (types_1.isListValueType(field) || types_1.isStructType(field) || types_1.isAnyValueType(field)) {
+                    return ts_poet_1.code `${type}.unwrap(${decodedValue})`;
+                }
                 return ts_poet_1.code `${decodedValue}.value`;
             };
-            const type = types_1.basicTypeName(ctx, field, { keepValueType: true });
             const decoder = ts_poet_1.code `${type}.decode(reader, reader.uint32())`;
             readSnippet = ts_poet_1.code `${unwrap(decoder)}`;
         }
@@ -687,17 +634,14 @@ function generateEncode(ctx, fullName, messageDesc) {
         }
         else if (types_1.isValueType(ctx, field)) {
             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))
-                    return ts_poet_1.code `${ctx.utils.wrapAnyValue}(${place})`;
-                if (types_1.isListValueType(field))
-                    return ts_poet_1.code `{values: ${place}}`;
-                if (types_1.isStructType(field))
-                    return ts_poet_1.code `${ctx.utils.wrapStruct}(${place})`;
+                if (types_1.isAnyValueType(field) || types_1.isListValueType(field) || types_1.isStructType(field)) {
+                    return ts_poet_1.code `${type}.wrap(${place})`;
+                }
                 return ts_poet_1.code `{${maybeTypeField} value: ${place}!}`;
             };
             const tag = ((field.number << 3) | 2) >>> 0;
-            const type = types_1.basicTypeName(ctx, field, { keepValueType: true });
             writeSnippet = (place) => ts_poet_1.code `${type}.encode(${wrappedValue(place)}, writer.uint32(${tag}).fork()).ldelim()`;
         }
         else if (types_1.isMessage(field)) {
@@ -1214,6 +1158,82 @@ function generateFromPartial(ctx, fullName, messageDesc) {
     chunks.push(ts_poet_1.code `}`);
     return ts_poet_1.joinCode(chunks, { on: '\n' });
 }
+function generateWrap(fullProtoTypeName) {
+    const chunks = [];
+    if (types_1.isStructTypeName(fullProtoTypeName)) {
+        chunks.push(ts_poet_1.code `wrap(object: {[key: string]: any} | undefined): Struct {
+      const struct = Struct.fromPartial({});
+      if (object !== undefined) {
+        Object.keys(object).forEach(key => {
+          struct.fields[key] = object[key];
+        });
+      }
+      return struct;
+    }`);
+    }
+    if (types_1.isAnyValueTypeName(fullProtoTypeName)) {
+        chunks.push(ts_poet_1.code `wrap(value: any): Value {
+      if (value === null) {
+        return {nullValue: 0} as Value;
+      } else if (typeof value === 'boolean') {
+        return {boolValue: value} as Value;
+      } else if (typeof value === 'number') {
+        return {numberValue: value} as Value;
+      } else if (typeof value === 'string') {
+        return {stringValue: value} as Value;
+      } else if (Array.isArray(value)) {
+        return {listValue: value} as Value;
+      } else if (typeof value === 'object') {
+        return {structValue: value} as Value;
+      } else if (typeof value === 'undefined') {
+        return {} as Value;
+      } else {
+        throw new Error('Unsupported any value type: ' + typeof value);
+      }
+    }`);
+    }
+    if (types_1.isListValueTypeName(fullProtoTypeName)) {
+        chunks.push(ts_poet_1.code `wrap(value: Array<any>): ListValue {
+      return {values: value};
+    }`);
+    }
+    return chunks;
+}
+function generateUnwrap(fullProtoTypeName) {
+    const chunks = [];
+    if (types_1.isStructTypeName(fullProtoTypeName)) {
+        chunks.push(ts_poet_1.code `unwrap(message: Struct): {[key: string]: any} {
+      const object: { [key: string]: any } = {};
+      Object.keys(message.fields).forEach(key => {
+        object[key] = message.fields[key];
+      });
+      return object;
+    }`);
+    }
+    if (types_1.isAnyValueTypeName(fullProtoTypeName)) {
+        chunks.push(ts_poet_1.code `unwrap(message: Value): string | number | boolean | Object | null | Array<any> | undefined {
+      if (message.stringValue !== undefined) {
+        return message.stringValue;
+      } else if (message.numberValue !== undefined) {
+        return message.numberValue;
+      } else if (message.boolValue !== undefined) {
+        return message.boolValue;
+      } else if (message.structValue !== undefined) {
+        return message.structValue;
+      } else if (message.listValue !== undefined) {
+          return message.listValue;
+      } else if (message.nullValue !== undefined) {
+        return null;
+      }
+    }`);
+    }
+    if (types_1.isListValueTypeName(fullProtoTypeName)) {
+        chunks.push(ts_poet_1.code `unwrap(message: ListValue): Array<any> {
+      return message.values;
+    }`);
+    }
+    return chunks;
+}
 exports.contextTypeVar = 'Context extends DataLoaders';
 function maybeCastToNumber(ctx, messageDesc, field, variableName) {
     const { keyType } = types_1.detectMapType(ctx, messageDesc, field);

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.isStructType = exports.isListValueTypeName = exports.isListValueType = exports.isBytesValueType = exports.isAnyValueType = 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.isStructTypeName = exports.isStructType = exports.isListValueTypeName = exports.isListValueType = exports.isBytesValueType = exports.isAnyValueTypeName = exports.isAnyValueType = 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");
@@ -360,9 +360,13 @@ function isValueType(ctx, field) {
 }
 exports.isValueType = isValueType;
 function isAnyValueType(field) {
-    return field.typeName === '.google.protobuf.Value';
+    return isAnyValueTypeName(field.typeName);
 }
 exports.isAnyValueType = isAnyValueType;
+function isAnyValueTypeName(typeName) {
+    return typeName === 'google.protobuf.Value' || typeName === '.google.protobuf.Value';
+}
+exports.isAnyValueTypeName = isAnyValueTypeName;
 function isBytesValueType(field) {
     return field.typeName === '.google.protobuf.BytesValue';
 }
@@ -376,9 +380,13 @@ function isListValueTypeName(typeName) {
 }
 exports.isListValueTypeName = isListValueTypeName;
 function isStructType(field) {
-    return field.typeName === '.google.protobuf.Struct';
+    return isStructTypeName(field.typeName);
 }
 exports.isStructType = isStructType;
+function isStructTypeName(typeName) {
+    return typeName === 'google.protobuf.Struct' || typeName === '.google.protobuf.Struct';
+}
+exports.isStructTypeName = isStructTypeName;
 function isLongValueType(field) {
     return field.typeName === '.google.protobuf.Int64Value' || field.typeName === '.google.protobuf.UInt64Value';
 }
@@ -428,6 +436,7 @@ function wrapperTypeName(typeName) {
         case '.google.protobuf.BytesValue':
         case '.google.protobuf.ListValue':
         case '.google.protobuf.Timestamp':
+        case '.google.protobuf.Struct':
             return typeName.split('.')[3];
         default:
             return undefined;
@@ -548,7 +557,7 @@ function requestType(ctx, methodDesc) {
 }
 exports.requestType = requestType;
 function responseType(ctx, methodDesc) {
-    return messageToTypeName(ctx, methodDesc.outputType);
+    return messageToTypeName(ctx, methodDesc.outputType, { keepValueType: true });
 }
 exports.responseType = responseType;
 function responsePromise(ctx, methodDesc) {

package/package.json

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