ts-proto 1.90.0 → 1.92.1

package/CHANGELOG.md

@@ -1,3 +1,36 @@
+## [1.92.1](https://github.com/stephenh/ts-proto/compare/v1.92.0...v1.92.1) (2021-12-02)
+
+
+### Bug Fixes
+
+* Respect stringEnums option in wrap function ([#420](https://github.com/stephenh/ts-proto/issues/420)) ([7adf90c](https://github.com/stephenh/ts-proto/commit/7adf90c23c46950bcf457b317764393ff4af2bf2))
+
+# [1.92.0](https://github.com/stephenh/ts-proto/compare/v1.91.0...v1.92.0) (2021-11-28)
+
+
+### Features
+
+* Use exact types for fromPartial ([#412](https://github.com/stephenh/ts-proto/issues/412)) ([808f8a7](https://github.com/stephenh/ts-proto/commit/808f8a7a77d56f65dd4a4643dd66158f106ab755)), closes [#156](https://github.com/stephenh/ts-proto/issues/156)
+
+# [1.91.0](https://github.com/stephenh/ts-proto/compare/v1.90.1...v1.91.0) (2021-11-27)
+
+
+### Bug Fixes
+
+* use Long.fromValue instead of Long.fromString for improved robustness regarding already parsed objects ([#405](https://github.com/stephenh/ts-proto/issues/405)) ([7bdc3ee](https://github.com/stephenh/ts-proto/commit/7bdc3eee05ed1318e18e27aa7d5bb2680060f8b6))
+
+
+### Features
+
+* Include dockerized protoc ([#404](https://github.com/stephenh/ts-proto/issues/404)) ([7564a78](https://github.com/stephenh/ts-proto/commit/7564a7887ccd0bb80cac19d313ee9bd8daae778d))
+
+## [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/README.markdown

@@ -18,7 +18,7 @@
   - [Supported options](#supported-options)
   - [Only Types](#only-types)
   - [NestJS Support](NESTJS.markdown)
-- [Building](#building)
+- [Development](#development)
 - [Assumptions](#assumptions)
 - [Todo](#todo)
 - [OneOf Handling](#oneof-handling)
@@ -26,7 +26,7 @@
 - [Well-Known Types](#well-known-types)
   - [Wrapper Types](#wrapper-types)
   - [JSON Types (Struct Types)](#json-types-struct-types)
-  - [Timestamps](#timestamp)
+  - [Timestamp](#timestamp)
 - [Wrapper Types](#wrapper-types)
 - [Number Types](#number-types)
 - [Current Status of Optional Values](#current-status-of-optional-values)
@@ -329,7 +329,7 @@ Generated code will be placed in the Gradle build directory.
 
   Note that `addGrpcMetadata`, `addNestjsRestParameter` and `returnObservable` will still be false.
 
-- With `--ts_proto_opt=useDate=false`, fields of type `google.protobuf.Timestamp` will not be mapped to type `Date` in the generated types. See [Timestamps](#timestamps) for more details.
+- With `--ts_proto_opt=useDate=false`, fields of type `google.protobuf.Timestamp` will not be mapped to type `Date` in the generated types. See [Timestamp](#timestamp) for more details.
 
 - With `--ts_proto_opt=outputSchema=true`, meta typings will be generated that can later be used in other code generators.
 
@@ -337,7 +337,7 @@ Generated code will be placed in the Gradle build directory.
 
 - With `--ts_proto_opt=outputServices=grpc-js`, ts-proto will output service definitions and server / client stubs in [grpc-js](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js) format.
 
-- With `--ts_proto_opt=outputServices=generic-definitions`, ts-proto will output generic (framework-agnostic) service definitions.
+- With `--ts_proto_opt=outputServices=generic-definitions`, ts-proto will output generic (framework-agnostic) service definitions. These definitions contain descriptors for each method with links to request and response types, which allows to generate server and client stubs at runtime, and also generate strong types for them at compile time. An example of a library that uses this approach is [nice-grpc](https://github.com/deeplay-io/nice-grpc).
 
 - With `--ts_proto_opt=outputServices=false`, or `=none`, ts-proto will output NO service definitions.
 
@@ -362,15 +362,69 @@ Kudos to our sponsors:
 
 If you need ts-proto customizations or priority support for your company, you can ping me at [via email](mailto:stephen.haberman@gmail.com).
 
-# Building
+# Development
 
-After running `yarn install`, run `./integration/pbjs.sh` to create the integration test types. These pbjs-generated files are not currently checked in.
+**Requirements**
 
-After this, the tests should pass.
+- [Docker](https://www.docker.com) or [protoc](https://github.com/protocolbuffers/protobuf/releases) v3.19.1
+- `yarn` — `npm install -g yarn`
 
-After making changes to `ts-proto`, you can run `cd integration` and `./codegen.sh` to re-generate the test case `*.ts` output files that are in each `integration/<test-case>/` directory.
+**Setup**
 
-The test suite's proto files (i.e. `simple.proto`, `batching.proto`, etc.) currently have serialized/`.bin` copies checked into git (i.e. `simple.bin`, `batching.bin`, etc.), so that the test suite can run without having to invoke the `protoc` build chain. I.e. if you change the `simple.proto`/etc. files, you'll need to run `./integration/update-bins.sh`, which does require having the `protoc` executable available.
+The commands below assume you have **Docker** installed. To use a **local** copy of `protoc` without docker, use commands suffixed with `:local`
+
+- Check out the [repository]() for the latest code.
+- Run `yarn install` to install the dependencies.
+- Run `yarn build:test` or `yarn build:test:local` to generate the test files.
+  > _This runs the following commands:_
+  >  - `proto2bin` — Converts integration test `.proto` files to `.bin`.
+  >  - `bin2ts` — Runs `ts-proto` on the `.bin` files to generate  `.ts`  files.
+  >  - `proto2pbjs` — Generates a reference implementation using `pbjs` for testing compatibility.
+- Run `yarn test`
+
+**Workflow**
+
+- Modifying the plugin implementation:
+  - Run `yarn bin2ts` or `yarn bin2ts:local`.  
+    _Since the proto files were not changed, you only need to regenerate the typescript files._
+  - Run `yarn test` to verify the typescript files are compatible with the reference implementation, and pass other tests.
+- Updating or adding `.proto` files in the integration directory:
+  - Run `yarn build:test` to regenerate the integration test files.
+  - Run `yarn test` to retest.
+
+**Contributing**
+
+- Run `yarn build:test` and `yarn test` to make sure everything works.
+- Run `yarn prettier` to format the typescript files.
+- Commit the changes:
+  - Also include the generated `.bin` files for the tests where you added or modified `.proto` files.  
+    > These are checked into git so that the test suite can run without having to invoke the `protoc` build chain.
+  - Also include the generated `.ts` files.
+- Create a pull request
+
+**Dockerized Protoc**
+
+The repository includes a dockerized version of `protoc`, which is configured in [docker-compose.yml](docker-compose.yml).
+
+It can be useful in case you want to manually invoke the plugin with a known version of `protoc`.
+
+Usage:
+
+```bash
+# Include the protoc alias in your shell.
+. aliases.sh
+
+# Run protoc as usual. The ts-proto directory is available in /ts-proto.
+protoc --plugin=/ts-proto/protoc-gen-ts_proto --ts_proto_out=./output -I=./protos ./protoc/*.proto
+
+# Or use the ts-protoc alias which specifies the plugin path for you.
+ts-protoc --ts_proto_out=./output -I=./protos ./protoc/*.proto
+```
+
+- All paths must be relative paths _within_ the current working directory of the host. `../` is not allowed
+- Within the docker container, the absolute path to the project root is `/ts-proto`
+- The container mounts the current working directory in `/host`, and sets it as its working directory.
+- Once `aliases.sh` is sourced, you can use the `protoc` command in any folder.
 
 # Assumptions
 

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/generate-type-registry.js

@@ -13,7 +13,7 @@ function generateTypeRegistry(ctx) {
     chunks.push(ts_poet_1.code `
     export const messageTypeRegistry = new Map<string, MessageType>();
   `);
-    chunks.push(ts_poet_1.code `${ctx.utils.DeepPartial.ifUsed}`);
+    chunks.push(ts_poet_1.code ` ${ctx.utils.Builtin.ifUsed} ${ctx.utils.DeepPartial.ifUsed}`);
     return ts_poet_1.joinCode(chunks, { on: '\n\n' });
 }
 exports.generateTypeRegistry = generateTypeRegistry;

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;
@@ -339,11 +289,20 @@ function makeDeepPartial(options, longs) {
     const maybeExport = options.exportCommonSymbols ? 'export' : '';
     // Allow passing longs as numbers or strings, nad we'll convert them
     const maybeLong = options.forceLong === options_1.LongOption.LONG ? ts_poet_1.code ` : T extends ${longs.Long} ? string | number | Long ` : '';
-    const keys = options.outputTypeRegistry ? ts_poet_1.code `Exclude<keyof T, '$type'>` : ts_poet_1.code `keyof T`;
+    const Builtin = ts_poet_1.conditionalOutput('Builtin', ts_poet_1.code `type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;`);
+    // Based on https://github.com/sindresorhus/type-fest/pull/259
+    const maybeExcludeType = options.outputTypeRegistry ? `| '$type'` : '';
+    const Exact = ts_poet_1.conditionalOutput('Exact', ts_poet_1.code `
+      type KeysOfUnion<T> = T extends T ? keyof T : never;
+      ${maybeExport} type Exact<P, I extends P> = P extends ${Builtin}
+        ? P
+        : P &
+        { [K in keyof P]: Exact<P[K], I[K]> } & Record<Exclude<keyof I, KeysOfUnion<P> ${maybeExcludeType}>, never>;
+    `);
     // Based on the type from ts-essentials
+    const keys = options.outputTypeRegistry ? ts_poet_1.code `Exclude<keyof T, '$type'>` : ts_poet_1.code `keyof T`;
     const DeepPartial = ts_poet_1.conditionalOutput('DeepPartial', ts_poet_1.code `
-      type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
-      ${maybeExport} type DeepPartial<T> =  T extends Builtin
+      ${maybeExport} type DeepPartial<T> =  T extends ${Builtin}
         ? T
         ${maybeLong}
         : T extends Array<infer U>
@@ -354,7 +313,7 @@ function makeDeepPartial(options, longs) {
         ? { [K in ${keys}]?: DeepPartial<T[K]> }
         : Partial<T>;
     `);
-    return { DeepPartial };
+    return { Builtin, DeepPartial, Exact };
 }
 function makeTimestampMethods(options, longs) {
     const Timestamp = ts_poet_1.imp('Timestamp@./google/protobuf/timestamp');
@@ -580,16 +539,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 +643,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)) {
@@ -879,7 +832,7 @@ function generateFromJson(ctx, fullName, messageDesc) {
                             }
                         }
                         else if (types_1.isLong(valueType) && options.forceLong === options_1.LongOption.LONG) {
-                            return ts_poet_1.code `Long.fromString(${from} as string)`;
+                            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`;
@@ -1101,8 +1054,9 @@ function generateFromPartial(ctx, fullName, messageDesc) {
     const chunks = [];
     const Timestamp = ts_poet_1.imp('Timestamp@./google/protobuf/timestamp');
     // create the basic function declaration
+    const paramName = messageDesc.field.length > 0 ? 'object' : '_';
     chunks.push(ts_poet_1.code `
-    fromPartial(${messageDesc.field.length > 0 ? 'object' : '_'}: ${utils.DeepPartial}<${fullName}>): ${fullName} {
+    fromPartial<I extends ${utils.Exact}<${utils.DeepPartial}<${fullName}>, I>>(${paramName}: I): ${fullName} {
       const message = { ...base${fullName} } as ${fullName};
   `);
     // add a check for each incoming field
@@ -1178,7 +1132,7 @@ function generateFromPartial(ctx, fullName, messageDesc) {
             }
             else {
                 chunks.push(ts_poet_1.code `
-          message.${fieldName} = (object.${fieldName} ?? []).map((e) => ${readSnippet('e')});
+          message.${fieldName} = object.${fieldName}?.map((e) => ${readSnippet('e')}) || [];
         `);
             }
         }
@@ -1214,6 +1168,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: NullValue.NULL_VALUE} 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.92.1",
   "description": "",
   "main": "build/plugin.js",
   "repository": "github:stephenh/ts-proto",
@@ -9,10 +9,19 @@
   },
   "scripts": {
     "build": "yarn tsc",
-    "setup": "cd ./integration && ./pbjs.sh && ./update-bins.sh && ./codegen.sh",
+    "build:test": "yarn proto2bin && yarn proto2pbjs && yarn bin2ts",
+    "build:test:local": "yarn proto2bin:local && yarn proto2pbjs:local && yarn bin2ts:local",
+    "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",
+    "bin2ts": "docker-compose run --rm protoc codegen.sh",
+    "proto2bin:local": "integration/update-bins.sh",
+    "proto2pbjs:local": "integration/pbjs.sh",
+    "bin2ts:local": "integration/codegen.sh",
     "test": "yarn jest -c jest.config.js --maxWorkers=2",
     "prettier": "prettier --write {src,tests}/**/*.ts",
-    "prettier:check": "prettier --list-different {src,tests}/**/*.ts"
+    "prettier:check": "prettier --list-different {src,tests}/**/*.ts",
+    "setup:docker": "docker-compose build"
   },
   "files": [
     "build"