ts-proto 1.126.1 → 1.128.0

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+# [1.128.0](https://github.com/stephenh/ts-proto/compare/v1.127.0...v1.128.0) (2022-10-13)
+
+
+### Features
+
+* added nestJsTimestampTypeWrapper ([#567](https://github.com/stephenh/ts-proto/issues/567)) ([59d451e](https://github.com/stephenh/ts-proto/commit/59d451e2857856ff54a3afe03ae115a1824df66f))
+
+# [1.127.0](https://github.com/stephenh/ts-proto/compare/v1.126.1...v1.127.0) (2022-10-12)
+
+
+### Features
+
+* **client:** allow overriding the service identifier ([#683](https://github.com/stephenh/ts-proto/issues/683)) ([10c7c99](https://github.com/stephenh/ts-proto/commit/10c7c99b1f43705d640ab1e602a7c1799e31ac08))
+* Import CallContext and CallOptions as type ([#684](https://github.com/stephenh/ts-proto/issues/684)) ([8b388f6](https://github.com/stephenh/ts-proto/commit/8b388f6c9f57dac34ca5836a4313d8247bb0fceb)), closes [#677](https://github.com/stephenh/ts-proto/issues/677)
+
 ## [1.126.1](https://github.com/stephenh/ts-proto/compare/v1.126.0...v1.126.1) (2022-09-21)
 
 

package/README.markdown

@@ -562,7 +562,7 @@ The commands below assume you have **Docker** installed. To use a **local** copy
 **Contributing**
 
 - Run `yarn build:test` and `yarn test` to make sure everything works.
-- Run `yarn prettier` to format the typescript files.
+- Run `yarn format` 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.

package/build/generate-nice-grpc.js

@@ -6,8 +6,8 @@ const case_1 = require("./case");
 const sourceInfo_1 = require("./sourceInfo");
 const types_1 = require("./types");
 const utils_1 = require("./utils");
-const CallOptions = (0, ts_poet_1.imp)("CallOptions@nice-grpc-common");
-const CallContext = (0, ts_poet_1.imp)("CallContext@nice-grpc-common");
+const CallOptions = (0, ts_poet_1.imp)("t:CallOptions@nice-grpc-common");
+const CallContext = (0, ts_poet_1.imp)("t:CallContext@nice-grpc-common");
 /**
  * Generates server / client stubs for `nice-grpc` library.
  */

package/build/generate-services.js

@@ -129,7 +129,7 @@ function generateRegularRpcMethod(ctx, fileDesc, serviceDesc, methodDesc) {
       const data = ${encode};
       const ${returnVariable} = this.rpc.${rpcMethod}(
         ${maybeCtx}
-        "${(0, utils_1.maybePrefixPackage)(fileDesc, serviceDesc.name)}",
+        this.service,
         "${methodDesc.name}",
         data
       );
@@ -148,7 +148,10 @@ function generateServiceClientImpl(ctx, fileDesc, serviceDesc) {
     // Create the constructor(rpc: Rpc)
     const rpcType = options.context ? "Rpc<Context>" : "Rpc";
     chunks.push((0, ts_poet_1.code) `private readonly rpc: ${rpcType};`);
-    chunks.push((0, ts_poet_1.code) `constructor(rpc: ${rpcType}) {`);
+    chunks.push((0, ts_poet_1.code) `private readonly service: string;`);
+    chunks.push((0, ts_poet_1.code) `constructor(rpc: ${rpcType}, opts?: {service?: string}) {`);
+    const serviceID = (0, utils_1.maybePrefixPackage)(fileDesc, serviceDesc.name);
+    chunks.push((0, ts_poet_1.code) `this.service = opts?.service || "${serviceID}";`);
     chunks.push((0, ts_poet_1.code) `this.rpc = rpc;`);
     // Bind each FooService method to the FooServiceImpl class
     for (const methodDesc of serviceDesc.method) {

package/build/main.js

@@ -67,6 +67,10 @@ function generateFile(ctx, fileDesc) {
     if (options.nestJs) {
         const prefix = (0, case_1.camelToSnake)(fileDesc.package.replace(/\./g, "_"));
         chunks.push((0, ts_poet_1.code) `export const ${prefix}_PACKAGE_NAME = '${fileDesc.package}';`);
+        if (options.useDate === options_1.DateOption.DATE &&
+            fileDesc.messageType.find((message) => message.field.find((field) => field.typeName === ".google.protobuf.Timestamp"))) {
+            chunks.push(makeProtobufTimestampWrapper());
+        }
     }
     if (options.outputEncodeMethods || options.outputJsonMethods || options.outputTypeRegistry) {
         // then add the encoder/decoder/base instance
@@ -225,6 +229,21 @@ function makeUtils(options) {
     };
 }
 exports.makeUtils = makeUtils;
+function makeProtobufTimestampWrapper() {
+    const wrappers = (0, ts_poet_1.imp)("wrappers@protobufjs");
+    return (0, ts_poet_1.code) `
+      ${wrappers}['.google.protobuf.Timestamp'] = {
+        fromObject(value: Date) {
+          return {
+            seconds: value.getTime() / 1000,
+            nanos: (value.getTime() % 1000) * 1e6,
+          };
+        },
+        toObject(message: { seconds: number; nanos: number }) {
+          return new Date(message.seconds * 1000 + message.nanos / 1e6);
+        },
+      } as any;`;
+}
 function makeLongUtils(options, bytes) {
     // Regardless of which `forceLong` config option we're using, we always use
     // the `long` library to either represent or at least sanity-check 64-bit values

package/package.json

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