ts-proto 2.12.4 → 2.13.1

package/README.markdown

@@ -264,7 +264,7 @@ When ts-proto recognizes methods of this pattern, it will automatically create a
 
 This provides the client code with the illusion that it can make individual `Get<OperationName>` calls (which is generally preferable/easier when implementing the client's business logic), but the actual implementation that ts-proto provides will end up making `Batch<OperationName>` calls to the backend service.
 
-You also need to enable the `useContext=true` build-time parameter, which gives all client methods a Go-style `ctx` parameter, with a `getDataLoaders` method that lets ts-proto cache/resolve request-scoped [DataLoaders](https://github.com/graphql/dataloader), which provide the fundamental auto-batch detection/flushing behavior.
+You also need `context=true`, which adds a Go-style `ctx` parameter to every client method. Your `ctx` must implement `getDataLoader`, which ts-proto uses to cache request-scoped [DataLoaders](https://github.com/graphql/dataloader) that handle batch detection and flushing. If you want `ctx` for tracing/metadata only, pass `useContextDataloaders=false` to skip the DataLoader contract.
 
 See the `batching.proto` file and related tests for examples/more details.
 
@@ -317,6 +317,8 @@ Generated code will be placed in the Gradle build directory.
 
 - With `--ts_proto_opt=context=true`, the services will have a Go-style `ctx` parameter, which is useful for tracing/logging/etc. if you're not using node's `async_hooks` api due to performance reasons.
 
+  By default `Context` must extend a generated `DataLoaders` interface so ts-proto can emit DataLoader-backed wrappers around `Get*`/`Batch*` methods. Pass `useContextDataloaders=false` to drop the constraint and skip those wrappers when you only need `ctx` for tracing/metadata.
+
 - With `--ts_proto_opt=forceLong=long`, all 64-bit numbers will be parsed as instances of `Long` (using the [long](https://www.npmjs.com/package/long) library).
 
   With `--ts_proto_opt=forceLong=string`, all 64-bit numbers will be output as strings.

package/build/src/generate-nestjs.js

@@ -13,7 +13,7 @@ function generateNestjsServiceController(ctx, fileDesc, sourceInfo, serviceDesc)
     const chunks = [];
     const Metadata = (0, ts_poet_1.imp)("t:Metadata@@grpc/grpc-js");
     (0, utils_1.maybeAddComment)(options, sourceInfo, chunks, serviceDesc.options?.deprecated);
-    const t = options.context ? `<${main_1.contextTypeVar}>` : "";
+    const t = options.context ? `<${(0, main_1.contextTypeVar)(options)}>` : "";
     chunks.push((0, ts_poet_1.code) `
     export interface ${serviceDesc.name}Controller${t} {
   `);
@@ -53,7 +53,7 @@ function generateNestjsServiceController(ctx, fileDesc, sourceInfo, serviceDesc)
         chunks.push((0, ts_poet_1.code) `
       ${methodDesc.formattedName}(${(0, ts_poet_1.joinCode)(params, { on: ", " })}): ${returns};
     `);
-        if (options.context) {
+        if (options.context && options.useContextDataloaders) {
             const batchMethod = (0, types_1.detectBatchMethod)(ctx, fileDesc, serviceDesc, methodDesc);
             if (batchMethod) {
                 const maybeCtx = options.context ? "ctx: Context," : "";
@@ -74,7 +74,7 @@ function generateNestjsServiceClient(ctx, fileDesc, sourceInfo, serviceDesc) {
     const chunks = [];
     const Metadata = (0, ts_poet_1.imp)("t:Metadata@@grpc/grpc-js");
     (0, utils_1.maybeAddComment)(options, sourceInfo, chunks);
-    const t = options.context ? `<${main_1.contextTypeVar}>` : ``;
+    const t = options.context ? `<${(0, main_1.contextTypeVar)(options)}>` : ``;
     chunks.push((0, ts_poet_1.code) `
     export interface ${serviceDesc.name}Client${t} {
   `);
@@ -102,7 +102,7 @@ function generateNestjsServiceClient(ctx, fileDesc, sourceInfo, serviceDesc) {
         ${(0, ts_poet_1.joinCode)(params, { on: "," })}
       ): ${returns};
     `);
-        if (options.context) {
+        if (options.context && options.useContextDataloaders) {
             const batchMethod = (0, types_1.detectBatchMethod)(ctx, fileDesc, serviceDesc, methodDesc);
             if (batchMethod) {
                 const maybeContext = options.context ? `ctx: Context,` : "";

package/build/src/generate-services.js

@@ -24,7 +24,7 @@ function generateService(ctx, fileDesc, sourceInfo, serviceDesc) {
     const { options } = ctx;
     const chunks = [];
     (0, utils_1.maybeAddComment)(options, sourceInfo, chunks, serviceDesc.options?.deprecated);
-    const maybeTypeVar = options.context ? `<${main_1.contextTypeVar}>` : "";
+    const maybeTypeVar = options.context ? `<${(0, main_1.contextTypeVar)(options)}>` : "";
     chunks.push((0, ts_poet_1.code) `export interface ${(0, ts_poet_1.def)(serviceDesc.name)}${maybeTypeVar} {`);
     serviceDesc.method.forEach((methodDesc, index) => {
         (0, utils_1.assertInstanceOf)(methodDesc, utils_1.FormattedMethodDescriptor);
@@ -61,7 +61,7 @@ function generateService(ctx, fileDesc, sourceInfo, serviceDesc) {
         }
         chunks.push((0, ts_poet_1.code) `${methodDesc.formattedName}(${(0, ts_poet_1.joinCode)(params, { on: "," })}): ${(0, types_1.responsePromiseOrObservable)(ctx, methodDesc)};`);
         // If this is a batch method, auto-generate the singular version of it
-        if (options.context) {
+        if (options.context && options.useContextDataloaders) {
             const batchMethod = (0, types_1.detectBatchMethod)(ctx, fileDesc, serviceDesc, methodDesc);
             if (batchMethod) {
                 chunks.push((0, ts_poet_1.code) `${batchMethod.singleMethodName}(
@@ -208,7 +208,7 @@ function generateServiceClientImpl(ctx, fileDesc, serviceDesc) {
     chunks.push((0, ts_poet_1.code) `export const ${serviceNameConst} = "${serviceName}";`);
     // Define the FooServiceImpl class
     const i = options.context ? `${name}<Context>` : name;
-    const t = options.context ? `<${main_1.contextTypeVar}>` : "";
+    const t = options.context ? `<${(0, main_1.contextTypeVar)(options)}>` : "";
     chunks.push((0, ts_poet_1.code) `export class ${name}ClientImpl${t} implements ${(0, ts_poet_1.def)(i)} {`);
     // Create the constructor(rpc: Rpc)
     const rpcType = options.context ? "Rpc<Context>" : "Rpc";
@@ -226,13 +226,14 @@ function generateServiceClientImpl(ctx, fileDesc, serviceDesc) {
     // Create a method for each FooService method
     for (const methodDesc of serviceDesc.method) {
         // See if this fuzzy matches to a batchable method
-        if (options.context) {
+        if (options.context && options.useContextDataloaders) {
             const batchMethod = (0, types_1.detectBatchMethod)(ctx, fileDesc, serviceDesc, methodDesc);
             if (batchMethod) {
                 chunks.push(generateBatchingRpcMethod(ctx, batchMethod));
             }
         }
         if (options.context &&
+            options.useContextDataloaders &&
             methodDesc.name.match(/^Get[A-Z]/) &&
             !methodDesc.serverStreaming &&
             !methodDesc.clientStreaming) {

package/build/src/main.d.ts

@@ -39,6 +39,7 @@ declare function makeObjectIdMethods(): {
 declare function makeTimestampMethods(options: Options, longs: ReturnType<typeof makeLongUtils>, bytes: ReturnType<typeof makeByteUtils>): {
     toTimestamp: ConditionalOutput;
     fromTimestamp: ConditionalOutput;
+    timestampFractionRegex: ConditionalOutput;
     fromJsonTimestamp: ConditionalOutput;
 };
 declare function makeComparisonUtils(): {
@@ -57,5 +58,5 @@ declare function makeExtensionClass(options: Options): {
 declare function makeAssertionUtils(bytes: ReturnType<typeof makeByteUtils>): {
     fail: ConditionalOutput;
 };
-export declare const contextTypeVar = "Context extends DataLoaders";
+export declare function contextTypeVar(options: Options): string;
 export {};

package/build/src/main.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.contextTypeVar = void 0;
 exports.generateFile = generateFile;
 exports.makeUtils = makeUtils;
+exports.contextTypeVar = contextTypeVar;
 const ts_poet_1 = require("ts-poet");
 const ConditionalOutput_1 = require("ts-poet/build/ConditionalOutput");
 const ts_proto_descriptors_1 = require("ts-proto-descriptors");
@@ -288,7 +288,7 @@ function generateFile(ctx, fileDesc) {
             chunks.push((0, generate_grpc_web_1.addGrpcWebMisc)(ctx, hasServerStreamingMethods));
         }
     }
-    if (options.context) {
+    if (options.context && options.useContextDataloaders) {
         chunks.push((0, generate_services_1.generateDataLoaderOptionsType)());
         chunks.push((0, generate_services_1.generateDataLoadersType)());
     }
@@ -773,6 +773,8 @@ function makeTimestampMethods(options, longs, bytes) {
             return new ${bytes.globalThis}.Date(millis);
           }
         `);
+    // Declared once per file, so the regex isn't compiled on each fromJsonTimestamp call
+    const timestampFractionRegex = (0, ts_poet_1.conditionalOutput)("timestampFractionRegex", (0, ts_poet_1.code) `const timestampFractionRegex = /:\\d{2}\\.\\d+/;`);
     const fromJsonTimestamp = (0, ts_poet_1.conditionalOutput)("fromJsonTimestamp", options.useDate === options_1.DateOption.DATE
         ? (0, ts_poet_1.code) `
         function fromJsonTimestamp(o: any): Date {
@@ -802,13 +804,24 @@ function makeTimestampMethods(options, longs, bytes) {
           if (o instanceof ${bytes.globalThis}.Date) {
             return ${toTimestamp}(o);
           } else if (typeof o === "string") {
-            return ${toTimestamp}(new ${bytes.globalThis}.Date(o));
+            // Date only keeps milliseconds, and parses longer fractions in an engine-specific way,
+            // so parse the fractional seconds ourselves and give Date only the whole seconds
+            const fraction = ${timestampFractionRegex}.exec(o);
+            if (fraction === null) {
+              return ${toTimestamp}(new ${bytes.globalThis}.Date(o));
+            }
+            const fractionNanos = Number(fraction[0].slice(4, 13).padEnd(9, "0"));
+            const wholeSeconds = new ${bytes.globalThis}.Date(o.replace(fraction[0], fraction[0].slice(0, 3)));
+            const timestamp = ${toTimestamp}(
+              new ${bytes.globalThis}.Date(wholeSeconds.getTime() + Math.trunc(fractionNanos / 1_000_000)),
+            );
+            return { ...timestamp, nanos: (timestamp.nanos ?? 0) + (fractionNanos % 1_000_000) };
           } else {
             return ${options.typePrefix}Timestamp${options.typeSuffix}.fromJSON(o);
           }
         }
       `);
-    return { toTimestamp, fromTimestamp, fromJsonTimestamp };
+    return { toTimestamp, fromTimestamp, timestampFractionRegex, fromJsonTimestamp };
 }
 function makeComparisonUtils() {
     const isObject = (0, ts_poet_1.conditionalOutput)("isObject", (0, ts_poet_1.code) `
@@ -938,9 +951,7 @@ function generateBaseInstanceFactory(ctx, fullName, messageDesc, fullTypeName) {
             const { oneofIndex } = field;
             if (!processedOneofs.has(oneofIndex)) {
                 processedOneofs.add(oneofIndex);
-                const name = options.useJsonName
-                    ? (0, utils_1.getFieldName)(field, options)
-                    : (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[oneofIndex].name, ctx.options);
+                const name = (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[oneofIndex].name, ctx.options);
                 fields.push((0, ts_poet_1.code) `${(0, utils_1.safeAccessor)(name)}: ${(0, utils_1.nullOrUndefined)(options)}`);
             }
             continue;
@@ -1205,9 +1216,7 @@ function generateDecode(ctx, fullName, messageDesc) {
             }
         }
         else if ((0, types_1.isWithinOneOfThatShouldBeUnion)(options, field)) {
-            const oneofNameWithMessage = options.useJsonName
-                ? messageProperty
-                : (0, utils_1.getPropertyAccessor)("message", (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[field.oneofIndex].name, options));
+            const oneofNameWithMessage = (0, utils_1.getPropertyAccessor)("message", (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[field.oneofIndex].name, options));
             const valueName = (0, utils_1.oneofValueName)(fieldName, options);
             chunks.push((0, ts_poet_1.code) `
         ${tagCheck}
@@ -1509,9 +1518,7 @@ function generateEncode(ctx, fullName, messageDesc) {
         else if ((0, types_1.isWithinOneOfThatShouldBeUnion)(options, field)) {
             if (!processedOneofs.has(field.oneofIndex)) {
                 processedOneofs.add(field.oneofIndex);
-                const oneofNameWithMessage = options.useJsonName
-                    ? messageProperty
-                    : (0, utils_1.getPropertyAccessor)("message", (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[field.oneofIndex].name, options));
+                const oneofNameWithMessage = (0, utils_1.getPropertyAccessor)("message", (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[field.oneofIndex].name, options));
                 chunks.push((0, ts_poet_1.code) `switch (${oneofNameWithMessage}?.$case) {`);
                 for (const oneOfField of oneOfFieldsDict[field.oneofIndex]) {
                     const writeSnippet = getEncodeWriteSnippet(ctx, oneOfField);
@@ -2386,9 +2393,7 @@ function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
         }
         else if ((0, types_1.isWithinOneOfThatShouldBeUnion)(options, field)) {
             // oneofs in a union are only output as `oneof name = ...`
-            const oneofNameWithMessage = options.useJsonName
-                ? messageProperty
-                : (0, utils_1.getPropertyAccessor)("message", (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[field.oneofIndex].name, options));
+            const oneofNameWithMessage = (0, utils_1.getPropertyAccessor)("message", (0, case_1.maybeSnakeToCamel)(messageDesc.oneofDecl[field.oneofIndex].name, options));
             const valueName = (0, utils_1.oneofValueName)(fieldName, options);
             chunks.push((0, ts_poet_1.code) `
         ${currentIfTarget === oneofNameWithMessage ? "else " : ""}if (${oneofNameWithMessage}?.$case === '${fieldName}') {
@@ -2629,7 +2634,9 @@ function generateFromPartial(ctx, fullName, messageDesc) {
     chunks.push((0, ts_poet_1.code) `}`);
     return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });
 }
-exports.contextTypeVar = "Context extends DataLoaders";
+function contextTypeVar(options) {
+    return options.useContextDataloaders ? "Context extends DataLoaders" : "Context";
+}
 function convertFromObjectKey(ctx, messageDesc, field, variableName) {
     const { keyType, keyField } = (0, types_1.detectMapType)(ctx, messageDesc, field);
     if (keyType.toCodeString([]) === "string") {

package/build/src/options.d.ts

@@ -44,6 +44,7 @@ export declare enum OutputSchemaOption {
 }
 export type Options = {
     context: boolean;
+    useContextDataloaders: boolean;
     snakeToCamel: Array<"json" | "keys">;
     protoJsonFormat: boolean;
     forceLong: LongOption;

package/build/src/options.js

@@ -59,6 +59,7 @@ var OutputSchemaOption;
 function defaultOptions() {
     return {
         context: false,
+        useContextDataloaders: true,
         snakeToCamel: ["json", "keys"],
         protoJsonFormat: true,
         emitDefaultValues: [],

package/package.json

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