ts-proto 1.110.2 → 1.111.0

package/CHANGELOG.md

@@ -1,3 +1,53 @@
+# [1.111.0](https://github.com/stephenh/ts-proto/compare/v1.110.4...v1.111.0) (2022-05-01)
+
+
+### Features
+
+* include service and definition types with implementations ([#552](https://github.com/stephenh/ts-proto/issues/552)) ([6b896f4](https://github.com/stephenh/ts-proto/commit/6b896f4b7f4ba0f0d97730767421786171646aea))
+
+## [next](https://github.com/stephenh/ts-proto/compare/v1.110.4...main) (????-??-??)
+
+### Features
+
+* When outputing service and service definition implementations, include types. Eg, before:
+
+  ```ts
+  export const TestDefinition = {
+    name: 'Test',
+    fullName: 'simple.Test',
+    methods: {
+      …
+    },
+  } as const;
+  ```
+
+  Now:
+
+  ```ts
+  export type TestDefinition = typeof TestDefinition;
+  export const TestDefinition = {
+    name: 'Test',
+    fullName: 'simple.Test',
+    methods: {
+      …
+    },
+  } as const;
+  ```
+
+## [1.110.4](https://github.com/stephenh/ts-proto/compare/v1.110.3...v1.110.4) (2022-04-08)
+
+
+### Bug Fixes
+
+* Use Uint8Array.forEach in base64FromBytes ([#544](https://github.com/stephenh/ts-proto/issues/544)) ([c7641ce](https://github.com/stephenh/ts-proto/commit/c7641ceb6a1c9da234245b9d808b2ded899dbbbc))
+
+## [1.110.3](https://github.com/stephenh/ts-proto/compare/v1.110.2...v1.110.3) (2022-04-08)
+
+
+### Bug Fixes
+
+* regression in being able to return a Date as a GRPC return value ([#534](https://github.com/stephenh/ts-proto/issues/534)) ([22b76ec](https://github.com/stephenh/ts-proto/commit/22b76eccfc0d26309aab9e454de31ef020595be8))
+
 ## [1.110.2](https://github.com/stephenh/ts-proto/compare/v1.110.1...v1.110.2) (2022-03-27)
 
 

package/README.markdown

@@ -473,7 +473,7 @@ If you need ts-proto customizations or priority support for your company, you ca
 
 **Setup**
 
-The commands below assume you have **Docker** installed. To use a **local** copy of `protoc` without docker, use commands suffixed with `:local`
+The commands below assume you have **Docker** installed. To use a **local** copy of `protoc` without docker, use commands suffixed with `:local`. If you are using OS X, install **coreutils**, `brew install coreutils`.
 
 - Check out the [repository]() for the latest code.
 - Run `yarn install` to install the dependencies.
@@ -784,4 +784,4 @@ Where (\*) indicates they might throw an error at runtime.
 - Required primitives: use as-is, i.e. `string name = 1`.
 - Optional primitives: use wrapper types, i.e. `StringValue name = 1`.
 - Required messages: not available
-- Optional primitives: use as-is, i.e. `SubMessage message = 1`.
+- Optional messages: use as-is, i.e. `SubMessage message = 1`.

package/build/generate-generic-service-definition.js

@@ -14,9 +14,14 @@ function generateGenericServiceDefinition(ctx, fileDesc, sourceInfo, serviceDesc
     var _a, _b, _c;
     const chunks = [];
     utils_1.maybeAddComment(sourceInfo, chunks, (_a = serviceDesc.options) === null || _a === void 0 ? void 0 : _a.deprecated);
+    // Service definition type
+    const name = ts_poet_1.def(`${serviceDesc.name}Definition`);
+    chunks.push(ts_poet_1.code `
+    export type ${name} = typeof ${name};
+  `);
     // Service definition
     chunks.push(ts_poet_1.code `
-    export const ${ts_poet_1.def(`${serviceDesc.name}Definition`)} = {
+    export const ${name} = {
   `);
     (_b = serviceDesc.options) === null || _b === void 0 ? void 0 : _b.uninterpretedOption;
     chunks.push(ts_poet_1.code `

package/build/generate-grpc-js.js

@@ -42,9 +42,14 @@ function generateServiceDefinition(ctx, fileDesc, sourceInfo, serviceDesc) {
     var _a, _b;
     const chunks = [];
     utils_1.maybeAddComment(sourceInfo, chunks, (_a = serviceDesc.options) === null || _a === void 0 ? void 0 : _a.deprecated);
+    // Service definition type
+    const name = ts_poet_1.def(`${serviceDesc.name}Service`);
+    chunks.push(ts_poet_1.code `
+    export type ${name} = typeof ${name};
+  `);
     // Service definition
     chunks.push(ts_poet_1.code `
-    export const ${ts_poet_1.def(`${serviceDesc.name}Service`)} = {
+    export const ${name} = {
   `);
     for (const [index, methodDesc] of serviceDesc.method.entries()) {
         utils_1.assertInstanceOf(methodDesc, utils_1.FormattedMethodDescriptor);

package/build/generate-services.js

@@ -75,15 +75,19 @@ function generateService(ctx, fileDesc, sourceInfo, serviceDesc) {
 exports.generateService = generateService;
 function generateRegularRpcMethod(ctx, fileDesc, serviceDesc, methodDesc) {
     utils_1.assertInstanceOf(methodDesc, utils_1.FormattedMethodDescriptor);
-    const { options } = ctx;
+    const { options, utils } = ctx;
     const Reader = ts_poet_1.imp('Reader@protobufjs/minimal');
     const rawInputType = types_1.rawRequestType(ctx, methodDesc);
     const inputType = types_1.requestType(ctx, methodDesc);
     const outputType = types_1.responseType(ctx, methodDesc);
+    const rawOutputType = types_1.responseType(ctx, methodDesc, { keepValueType: true });
     const params = [...(options.context ? [ts_poet_1.code `ctx: Context`] : []), ts_poet_1.code `request: ${inputType}`];
     const maybeCtx = options.context ? 'ctx,' : '';
     let encode = ts_poet_1.code `${rawInputType}.encode(request).finish()`;
     let decode = ts_poet_1.code `data => ${outputType}.decode(new ${Reader}(data))`;
+    if (options.useDate && rawOutputType.toString().includes('Timestamp')) {
+        decode = ts_poet_1.code `data => ${utils.fromTimestamp}(${rawOutputType}.decode(new ${Reader}(data)))`;
+    }
     if (methodDesc.clientStreaming) {
         encode = ts_poet_1.code `request.pipe(${ts_poet_1.imp('map@rxjs/operators')}(request => ${encode}))`;
     }

package/build/main.js

@@ -290,9 +290,9 @@ function makeByteUtils() {
       const btoa : (bin: string) => string = ${globalThis}.btoa || ((bin) => ${globalThis}.Buffer.from(bin, 'binary').toString('base64'));
       function base64FromBytes(arr: Uint8Array): string {
         const bin: string[] = [];
-        for (const byte of arr) {
+        arr.forEach((byte) => {
           bin.push(String.fromCharCode(byte));
-        }
+        });
         return btoa(bin.join(''));
       }
     `);

package/build/types.js

@@ -612,8 +612,8 @@ function requestType(ctx, methodDesc, partial = false) {
     return typeName;
 }
 exports.requestType = requestType;
-function responseType(ctx, methodDesc) {
-    return messageToTypeName(ctx, methodDesc.outputType, { keepValueType: true });
+function responseType(ctx, methodDesc, typeOptions = {}) {
+    return messageToTypeName(ctx, methodDesc.outputType, typeOptions);
 }
 exports.responseType = responseType;
 function responsePromise(ctx, methodDesc) {

package/package.json

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