From c85c3a7f4c023be337317ca72093d2ff5a896804 Mon Sep 17 00:00:00 2001 From: Zak Henry Date: Thu, 20 Sep 2018 17:31:04 +0100 Subject: [PATCH] fix(ClientReadableStream): Fixes return type generic argument of ClientReadableStream calls to correct use the response type not the request type. --- build/lib/template/svc_tsd.hbs | 10 ++++----- examples/build/client.js.map | 2 +- examples/build/proto/book_grpc_pb.d.ts | 8 +++---- examples/package-lock.json | 30 +++++++++++++------------- examples/src/client.ts | 2 +- examples/src/proto/book_grpc_pb.d.ts | 8 +++---- package-lock.json | 14 ++++++------ package.json | 2 +- src/lib/ExportMap.ts | 2 +- src/lib/template/svc_tsd.hbs | 10 ++++----- 10 files changed, 44 insertions(+), 44 deletions(-) diff --git a/build/lib/template/svc_tsd.hbs b/build/lib/template/svc_tsd.hbs index cb283ca..7773702 100644 --- a/build/lib/template/svc_tsd.hbs +++ b/build/lib/template/svc_tsd.hbs @@ -59,8 +59,8 @@ export interface I{{{serviceName}}}Client { {{lcFirst methodName}}(metadata: grpc.Metadata, options: Partial, callback: (error: Error | null, response: {{{responseTypeName}}}) => void): grpc.ClientWritableStream<{{{requestTypeName}}}>; {{/eq}} {{#eq type "ClientReadableStream"}} - {{lcFirst methodName}}(request: {{{requestTypeName}}}, options?: Partial): grpc.ClientReadableStream<{{{requestTypeName}}}>; - {{lcFirst methodName}}(request: {{{requestTypeName}}}, metadata?: grpc.Metadata, options?: Partial): grpc.ClientReadableStream<{{{requestTypeName}}}>; + {{lcFirst methodName}}(request: {{{requestTypeName}}}, options?: Partial): grpc.ClientReadableStream<{{{responseTypeName}}}>; + {{lcFirst methodName}}(request: {{{requestTypeName}}}, metadata?: grpc.Metadata, options?: Partial): grpc.ClientReadableStream<{{{responseTypeName}}}>; {{/eq}} {{#eq type "ClientDuplexStream"}} {{lcFirst methodName}}(): grpc.ClientDuplexStream<{{{requestTypeName}}}, {{{responseTypeName}}}>; @@ -85,8 +85,8 @@ export class {{{serviceName}}}Client extends grpc.Client implements I{{{serviceN public {{lcFirst methodName}}(metadata: grpc.Metadata, options: Partial, callback: (error: Error | null, response: {{{responseTypeName}}}) => void): grpc.ClientWritableStream<{{{requestTypeName}}}>; {{/eq}} {{#eq type "ClientReadableStream"}} - public {{lcFirst methodName}}(request: {{{requestTypeName}}}, options?: Partial): grpc.ClientReadableStream<{{{requestTypeName}}}>; - public {{lcFirst methodName}}(request: {{{requestTypeName}}}, metadata?: grpc.Metadata, options?: Partial): grpc.ClientReadableStream<{{{requestTypeName}}}>; + public {{lcFirst methodName}}(request: {{{requestTypeName}}}, options?: Partial): grpc.ClientReadableStream<{{{responseTypeName}}}>; + public {{lcFirst methodName}}(request: {{{requestTypeName}}}, metadata?: grpc.Metadata, options?: Partial): grpc.ClientReadableStream<{{{responseTypeName}}}>; {{/eq}} {{#eq type "ClientDuplexStream"}} public {{lcFirst methodName}}(options?: Partial): grpc.ClientDuplexStream<{{{requestTypeName}}}, {{{responseTypeName}}}>; @@ -94,4 +94,4 @@ export class {{{serviceName}}}Client extends grpc.Client implements I{{{serviceN {{/eq}} {{/each}} } -{{/each}} \ No newline at end of file +{{/each}} diff --git a/examples/build/client.js.map b/examples/build/client.js.map index fdadd6b..5515066 100644 --- a/examples/build/client.js.map +++ b/examples/build/client.js.map @@ -1 +1 @@ -{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/examples/build/proto/book_grpc_pb.d.ts b/examples/build/proto/book_grpc_pb.d.ts index 2e05a68..7ac8f57 100644 --- a/examples/build/proto/book_grpc_pb.d.ts +++ b/examples/build/proto/book_grpc_pb.d.ts @@ -63,8 +63,8 @@ export interface IBookServiceClient { getBook(request: book_pb.GetBookRequest, callback: (error: Error | null, response: book_pb.Book) => void): grpc.ClientUnaryCall; getBook(request: book_pb.GetBookRequest, metadata: grpc.Metadata, callback: (error: Error | null, response: book_pb.Book) => void): grpc.ClientUnaryCall; getBook(request: book_pb.GetBookRequest, metadata: grpc.Metadata, options: Partial, callback: (error: Error | null, response: book_pb.Book) => void): grpc.ClientUnaryCall; - getBooksViaAuthor(request: book_pb.GetBookViaAuthor, options?: Partial): grpc.ClientReadableStream; - getBooksViaAuthor(request: book_pb.GetBookViaAuthor, metadata?: grpc.Metadata, options?: Partial): grpc.ClientReadableStream; + getBooksViaAuthor(request: book_pb.GetBookViaAuthor, options?: Partial): grpc.ClientReadableStream; + getBooksViaAuthor(request: book_pb.GetBookViaAuthor, metadata?: grpc.Metadata, options?: Partial): grpc.ClientReadableStream; getGreatestBook(callback: (error: Error | null, response: book_pb.Book) => void): grpc.ClientWritableStream; getGreatestBook(metadata: grpc.Metadata, callback: (error: Error | null, response: book_pb.Book) => void): grpc.ClientWritableStream; getGreatestBook(options: Partial, callback: (error: Error | null, response: book_pb.Book) => void): grpc.ClientWritableStream; @@ -79,8 +79,8 @@ export class BookServiceClient extends grpc.Client implements IBookServiceClient public getBook(request: book_pb.GetBookRequest, callback: (error: Error | null, response: book_pb.Book) => void): grpc.ClientUnaryCall; public getBook(request: book_pb.GetBookRequest, metadata: grpc.Metadata, callback: (error: Error | null, response: book_pb.Book) => void): grpc.ClientUnaryCall; public getBook(request: book_pb.GetBookRequest, metadata: grpc.Metadata, options: Partial, callback: (error: Error | null, response: book_pb.Book) => void): grpc.ClientUnaryCall; - public getBooksViaAuthor(request: book_pb.GetBookViaAuthor, options?: Partial): grpc.ClientReadableStream; - public getBooksViaAuthor(request: book_pb.GetBookViaAuthor, metadata?: grpc.Metadata, options?: Partial): grpc.ClientReadableStream; + public getBooksViaAuthor(request: book_pb.GetBookViaAuthor, options?: Partial): grpc.ClientReadableStream; + public getBooksViaAuthor(request: book_pb.GetBookViaAuthor, metadata?: grpc.Metadata, options?: Partial): grpc.ClientReadableStream; public getGreatestBook(callback: (error: Error | null, response: book_pb.Book) => void): grpc.ClientWritableStream; public getGreatestBook(metadata: grpc.Metadata, callback: (error: Error | null, response: book_pb.Book) => void): grpc.ClientWritableStream; public getGreatestBook(options: Partial, callback: (error: Error | null, response: book_pb.Book) => void): grpc.ClientWritableStream; diff --git a/examples/package-lock.json b/examples/package-lock.json index 2dcbb7c..e900b89 100644 --- a/examples/package-lock.json +++ b/examples/package-lock.json @@ -717,13 +717,6 @@ "tweetnacl": "0.14.5" } }, - "string_decoder": { - "version": "1.0.3", - "bundled": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, "string-width": { "version": "1.0.2", "bundled": true, @@ -733,6 +726,13 @@ "strip-ansi": "3.0.1" } }, + "string_decoder": { + "version": "1.0.3", + "bundled": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, "stringstream": { "version": "0.0.5", "bundled": true @@ -1518,14 +1518,6 @@ } } }, - "string_decoder": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, "string-width": { "version": "1.0.2", "bundled": true, @@ -1536,6 +1528,14 @@ "strip-ansi": "3.0.1" } }, + "string_decoder": { + "version": "1.0.3", + "bundled": true, + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, "stringstream": { "version": "0.0.5", "bundled": true, diff --git a/examples/src/client.ts b/examples/src/client.ts index 8cf9fd5..deb9bb5 100644 --- a/examples/src/client.ts +++ b/examples/src/client.ts @@ -57,7 +57,7 @@ const getBooksViaAuthor = (author: string) => { log(`[getBooksViaAuthor] Request: ${JSON.stringify(request.toObject())}`); - const stream: grpc.ClientReadableStream = client.getBooksViaAuthor(request); + const stream: grpc.ClientReadableStream = client.getBooksViaAuthor(request); stream.on("data", (data: Book) => { log(`[getBooksViaAuthor] Book: ${JSON.stringify(data.toObject())}`); }); diff --git a/examples/src/proto/book_grpc_pb.d.ts b/examples/src/proto/book_grpc_pb.d.ts index 2e05a68..7ac8f57 100644 --- a/examples/src/proto/book_grpc_pb.d.ts +++ b/examples/src/proto/book_grpc_pb.d.ts @@ -63,8 +63,8 @@ export interface IBookServiceClient { getBook(request: book_pb.GetBookRequest, callback: (error: Error | null, response: book_pb.Book) => void): grpc.ClientUnaryCall; getBook(request: book_pb.GetBookRequest, metadata: grpc.Metadata, callback: (error: Error | null, response: book_pb.Book) => void): grpc.ClientUnaryCall; getBook(request: book_pb.GetBookRequest, metadata: grpc.Metadata, options: Partial, callback: (error: Error | null, response: book_pb.Book) => void): grpc.ClientUnaryCall; - getBooksViaAuthor(request: book_pb.GetBookViaAuthor, options?: Partial): grpc.ClientReadableStream; - getBooksViaAuthor(request: book_pb.GetBookViaAuthor, metadata?: grpc.Metadata, options?: Partial): grpc.ClientReadableStream; + getBooksViaAuthor(request: book_pb.GetBookViaAuthor, options?: Partial): grpc.ClientReadableStream; + getBooksViaAuthor(request: book_pb.GetBookViaAuthor, metadata?: grpc.Metadata, options?: Partial): grpc.ClientReadableStream; getGreatestBook(callback: (error: Error | null, response: book_pb.Book) => void): grpc.ClientWritableStream; getGreatestBook(metadata: grpc.Metadata, callback: (error: Error | null, response: book_pb.Book) => void): grpc.ClientWritableStream; getGreatestBook(options: Partial, callback: (error: Error | null, response: book_pb.Book) => void): grpc.ClientWritableStream; @@ -79,8 +79,8 @@ export class BookServiceClient extends grpc.Client implements IBookServiceClient public getBook(request: book_pb.GetBookRequest, callback: (error: Error | null, response: book_pb.Book) => void): grpc.ClientUnaryCall; public getBook(request: book_pb.GetBookRequest, metadata: grpc.Metadata, callback: (error: Error | null, response: book_pb.Book) => void): grpc.ClientUnaryCall; public getBook(request: book_pb.GetBookRequest, metadata: grpc.Metadata, options: Partial, callback: (error: Error | null, response: book_pb.Book) => void): grpc.ClientUnaryCall; - public getBooksViaAuthor(request: book_pb.GetBookViaAuthor, options?: Partial): grpc.ClientReadableStream; - public getBooksViaAuthor(request: book_pb.GetBookViaAuthor, metadata?: grpc.Metadata, options?: Partial): grpc.ClientReadableStream; + public getBooksViaAuthor(request: book_pb.GetBookViaAuthor, options?: Partial): grpc.ClientReadableStream; + public getBooksViaAuthor(request: book_pb.GetBookViaAuthor, metadata?: grpc.Metadata, options?: Partial): grpc.ClientReadableStream; public getGreatestBook(callback: (error: Error | null, response: book_pb.Book) => void): grpc.ClientWritableStream; public getGreatestBook(metadata: grpc.Metadata, callback: (error: Error | null, response: book_pb.Book) => void): grpc.ClientWritableStream; public getGreatestBook(options: Partial, callback: (error: Error | null, response: book_pb.Book) => void): grpc.ClientWritableStream; diff --git a/package-lock.json b/package-lock.json index e4a7b11..b31f953 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1139,13 +1139,6 @@ "tweetnacl": "0.14.5" } }, - "string_decoder": { - "version": "1.0.3", - "bundled": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, "string-width": { "version": "1.0.2", "bundled": true, @@ -1155,6 +1148,13 @@ "strip-ansi": "3.0.1" } }, + "string_decoder": { + "version": "1.0.3", + "bundled": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, "stringstream": { "version": "0.0.5", "bundled": true diff --git a/package.json b/package.json index 96c2808..1681c5e 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "Generate d.ts definitions for generated js files from grpc_tools_node_protoc", "main": "build/index.js", "scripts": { - "build": "tsc -p .", + "build": "tsc -p . && cp -r src/lib/template build/lib", "test": "echo \"Error: no test specified\" && exit 1" }, "bin": { diff --git a/src/lib/ExportMap.ts b/src/lib/ExportMap.ts index f2e6acb..8b81134 100644 --- a/src/lib/ExportMap.ts +++ b/src/lib/ExportMap.ts @@ -79,4 +79,4 @@ export class ExportMap { getEnum(str: string): ExportEnumEntry | undefined { return this.enumMap[str]; } -} \ No newline at end of file +} diff --git a/src/lib/template/svc_tsd.hbs b/src/lib/template/svc_tsd.hbs index cb283ca..7773702 100644 --- a/src/lib/template/svc_tsd.hbs +++ b/src/lib/template/svc_tsd.hbs @@ -59,8 +59,8 @@ export interface I{{{serviceName}}}Client { {{lcFirst methodName}}(metadata: grpc.Metadata, options: Partial, callback: (error: Error | null, response: {{{responseTypeName}}}) => void): grpc.ClientWritableStream<{{{requestTypeName}}}>; {{/eq}} {{#eq type "ClientReadableStream"}} - {{lcFirst methodName}}(request: {{{requestTypeName}}}, options?: Partial): grpc.ClientReadableStream<{{{requestTypeName}}}>; - {{lcFirst methodName}}(request: {{{requestTypeName}}}, metadata?: grpc.Metadata, options?: Partial): grpc.ClientReadableStream<{{{requestTypeName}}}>; + {{lcFirst methodName}}(request: {{{requestTypeName}}}, options?: Partial): grpc.ClientReadableStream<{{{responseTypeName}}}>; + {{lcFirst methodName}}(request: {{{requestTypeName}}}, metadata?: grpc.Metadata, options?: Partial): grpc.ClientReadableStream<{{{responseTypeName}}}>; {{/eq}} {{#eq type "ClientDuplexStream"}} {{lcFirst methodName}}(): grpc.ClientDuplexStream<{{{requestTypeName}}}, {{{responseTypeName}}}>; @@ -85,8 +85,8 @@ export class {{{serviceName}}}Client extends grpc.Client implements I{{{serviceN public {{lcFirst methodName}}(metadata: grpc.Metadata, options: Partial, callback: (error: Error | null, response: {{{responseTypeName}}}) => void): grpc.ClientWritableStream<{{{requestTypeName}}}>; {{/eq}} {{#eq type "ClientReadableStream"}} - public {{lcFirst methodName}}(request: {{{requestTypeName}}}, options?: Partial): grpc.ClientReadableStream<{{{requestTypeName}}}>; - public {{lcFirst methodName}}(request: {{{requestTypeName}}}, metadata?: grpc.Metadata, options?: Partial): grpc.ClientReadableStream<{{{requestTypeName}}}>; + public {{lcFirst methodName}}(request: {{{requestTypeName}}}, options?: Partial): grpc.ClientReadableStream<{{{responseTypeName}}}>; + public {{lcFirst methodName}}(request: {{{requestTypeName}}}, metadata?: grpc.Metadata, options?: Partial): grpc.ClientReadableStream<{{{responseTypeName}}}>; {{/eq}} {{#eq type "ClientDuplexStream"}} public {{lcFirst methodName}}(options?: Partial): grpc.ClientDuplexStream<{{{requestTypeName}}}, {{{responseTypeName}}}>; @@ -94,4 +94,4 @@ export class {{{serviceName}}}Client extends grpc.Client implements I{{{serviceN {{/eq}} {{/each}} } -{{/each}} \ No newline at end of file +{{/each}}