ts-proto 1.164.0 → 1.164.2

package/README.markdown

@@ -147,6 +147,8 @@ If you'd like an out-of-the-box RPC framework built on top of ts-proto, there ar
 
 (Note for potential contributors, if you develop other frameworks/mini-frameworks, or even blog posts/tutorials, on using `ts-proto`, we're happy to link to them.)
 
+We also don't support clients for `google.api.http`-based [Google Cloud](https://cloud.google.com/endpoints/docs/grpc/transcoding) APIs, see [#948](https://github.com/stephenh/ts-proto/issues/948) if you'd like to submit a PR.
+
 # Example Types
 
 The generated types are "just data", i.e.:
@@ -889,11 +891,14 @@ ExampleMessage.encode({ anything: true });
 ## Timestamp
 
 The representation of `google.protobuf.Timestamp` is configurable by the `useDate` flag.
+The `useJsonTimestamp` flag controls precision when `useDate` is `false`.
 
 | Protobuf well-known type    | Default/`useDate=true` | `useDate=false`                      | `useDate=string` |
 | --------------------------- | ---------------------- | ------------------------------------ | ---------------- |
 | `google.protobuf.Timestamp` | `Date`                 | `{ seconds: number, nanos: number }` | `string`         |
 
+When using `useDate=false` and `useJsonTimestamp=raw` timestamp is represented as `{ seconds: number, nanos: number }`, but has nanosecond precision.
+
 # Number Types
 
 Numbers are by default assumed to be plain JavaScript `number`s.

package/build/generate-grpc-web.js

@@ -301,13 +301,6 @@ function createObservableUnaryMethod(ctx) {
 function createInvokeMethod(ctx) {
     const { options } = ctx;
     const { useAbortSignal } = options;
-    const maybeAbortSignal = useAbortSignal
-        ? `
-      if (abortSignal) abortSignal.addEventListener("abort", () => {
-        observer.error(abortSignal.reason);
-        client.close();
-      });`
-        : "";
     return (0, ts_poet_1.code) `
     invoke<T extends UnaryMethodDefinitionish>(
       methodDesc: T,
@@ -344,14 +337,27 @@ function createInvokeMethod(ctx) {
               }
             },
           });
-          observer.add(() => {
-           ${!useAbortSignal
-        ? `return client.close();`
-        : `if (!abortSignal || !abortSignal.aborted) 
-              return client.close();`}
-          });
+          ${useAbortSignal
+        ? `
+          if (abortSignal) {
+            const abort = () => {
+              observer.error(abortSignal.reason);
+              client.close();
+            };
+            abortSignal.addEventListener("abort", abort);
+            observer.add(() => {
+              if (abortSignal.aborted) {
+                return;
+              }
 
-          ${maybeAbortSignal}
+              abortSignal.removeEventListener('abort', abort); 
+              client.close();
+            });
+          } else {
+            observer.add(() => client.close());
+          }
+          `
+        : `observer.add(() => client.close());`}
         });
         upStream();
       }).pipe(${share}());

package/build/main.js

@@ -2,24 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.contextTypeVar = exports.makeUtils = exports.generateFile = void 0;
 const ts_poet_1 = require("ts-poet");
+const ConditionalOutput_1 = require("ts-poet/build/ConditionalOutput");
 const ts_proto_descriptors_1 = require("ts-proto-descriptors");
-const types_1 = require("./types");
-const sourceInfo_1 = require("./sourceInfo");
-const utils_1 = require("./utils");
 const case_1 = require("./case");
-const generate_nestjs_1 = require("./generate-nestjs");
-const generate_services_1 = require("./generate-services");
-const generate_grpc_web_1 = require("./generate-grpc-web");
-const generate_async_iterable_1 = require("./generate-async-iterable");
 const enums_1 = require("./enums");
-const visit_1 = require("./visit");
-const options_1 = require("./options");
-const schema_1 = require("./schema");
-const ConditionalOutput_1 = require("ts-poet/build/ConditionalOutput");
-const generate_grpc_js_1 = require("./generate-grpc-js");
+const generate_async_iterable_1 = require("./generate-async-iterable");
 const generate_generic_service_definition_1 = require("./generate-generic-service-definition");
+const generate_grpc_js_1 = require("./generate-grpc-js");
+const generate_grpc_web_1 = require("./generate-grpc-web");
+const generate_nestjs_1 = require("./generate-nestjs");
 const generate_nice_grpc_1 = require("./generate-nice-grpc");
+const generate_services_1 = require("./generate-services");
 const generate_struct_wrappers_1 = require("./generate-struct-wrappers");
+const options_1 = require("./options");
+const schema_1 = require("./schema");
+const sourceInfo_1 = require("./sourceInfo");
+const types_1 = require("./types");
+const utils_1 = require("./utils");
+const visit_1 = require("./visit");
 function generateFile(ctx, fileDesc) {
     var _a;
     const { options, utils } = ctx;
@@ -1733,7 +1733,10 @@ function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
                 return (0, ts_poet_1.code) `${from}`;
             }
             else if ((0, types_1.isTimestamp)(field) && options.useDate === options_1.DateOption.TIMESTAMP) {
-                return (0, ts_poet_1.code) `${from}`;
+                if (options.useJsonTimestamp === options_1.JsonTimestampOption.RAW) {
+                    return (0, ts_poet_1.code) `${from}`;
+                }
+                return (0, ts_poet_1.code) `${utils.fromTimestamp}(${from}).toISOString()`;
             }
             else if ((0, types_1.isMapType)(ctx, messageDesc, field)) {
                 // For map types, drill-in and then admittedly re-hard-code our per-value-type logic

package/build/options.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addTypeToMessages = exports.getTsPoetOpts = exports.optionsFromParameter = exports.defaultOptions = exports.ServiceOption = exports.OneofOption = exports.EnvOption = exports.DateOption = exports.LongOption = void 0;
+exports.addTypeToMessages = exports.getTsPoetOpts = exports.optionsFromParameter = exports.defaultOptions = exports.ServiceOption = exports.OneofOption = exports.EnvOption = exports.JsonTimestampOption = exports.DateOption = exports.LongOption = void 0;
 var LongOption;
 (function (LongOption) {
     LongOption["NUMBER"] = "number";
@@ -14,6 +14,11 @@ var DateOption;
     DateOption["STRING"] = "string";
     DateOption["TIMESTAMP"] = "timestamp";
 })(DateOption || (exports.DateOption = DateOption = {}));
+var JsonTimestampOption;
+(function (JsonTimestampOption) {
+    JsonTimestampOption["RFC3339"] = "rfc3339";
+    JsonTimestampOption["RAW"] = "raw";
+})(JsonTimestampOption || (exports.JsonTimestampOption = JsonTimestampOption = {}));
 var EnvOption;
 (function (EnvOption) {
     EnvOption["NODE"] = "node";
@@ -42,6 +47,7 @@ function defaultOptions() {
         forceLong: LongOption.NUMBER,
         useOptionals: "none",
         useDate: DateOption.DATE,
+        useJsonTimestamp: JsonTimestampOption.RFC3339,
         useMongoObjectId: false,
         oneof: OneofOption.PROPERTIES,
         esModuleInterop: false,

package/package.json

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