grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2007 from murgatroid99/grpc-js_types_node_fix 

grpc-js: Fix compatibility with @types/node 17.0.6
This commit is contained in:
Michael Lumish 2022-01-04 14:24:13 -08:00 committed by GitHub
parent 5548679b02 fba2b9498f
commit a65fdcedb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grpc-js/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@grpc/grpc-js", "name": "@grpc/grpc-js",
"version": "1.4.5", "version": "1.4.6",
"description": "gRPC Library for Node - pure JS implementation", "description": "gRPC Library for Node - pure JS implementation",
"homepage": "https://grpc.io/", "homepage": "https://grpc.io/",
"repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js", "repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js",

25
packages/grpc-js/src/object-stream.ts
View File

@ -36,9 +36,9 @@ export interface IntermediateObjectWritable<T> extends Writable {
write(chunk: any & T, cb?: WriteCallback): boolean; write(chunk: any & T, cb?: WriteCallback): boolean;
write(chunk: any & T, encoding?: any, cb?: WriteCallback): boolean; write(chunk: any & T, encoding?: any, cb?: WriteCallback): boolean;
setDefaultEncoding(encoding: string): this; setDefaultEncoding(encoding: string): this;
end(): void; end(): ReturnType<Writable['end']> extends Writable ? this : void;
end(chunk: any & T, cb?: Function): void; end(chunk: any & T, cb?: Function): ReturnType<Writable['end']> extends Writable ? this : void;
end(chunk: any & T, encoding?: any, cb?: Function): void; end(chunk: any & T, encoding?: any, cb?: Function): ReturnType<Writable['end']> extends Writable ? this : void;
} }
export interface ObjectWritable<T> extends IntermediateObjectWritable<T> { export interface ObjectWritable<T> extends IntermediateObjectWritable<T> {
@ -46,20 +46,7 @@ export interface ObjectWritable<T> extends IntermediateObjectWritable<T> {
write(chunk: T, cb?: Function): boolean; write(chunk: T, cb?: Function): boolean;
write(chunk: T, encoding?: any, cb?: Function): boolean; write(chunk: T, encoding?: any, cb?: Function): boolean;
setDefaultEncoding(encoding: string): this; setDefaultEncoding(encoding: string): this;
end(): void; end(): ReturnType<Writable['end']> extends Writable ? this : void;
end(chunk: T, cb?: Function): void; end(chunk: T, cb?: Function): ReturnType<Writable['end']> extends Writable ? this : void;
end(chunk: T, encoding?: any, cb?: Function): void; end(chunk: T, encoding?: any, cb?: Function): ReturnType<Writable['end']> extends Writable ? this : void;
} }
export type ObjectDuplex<T, U> = {
read(size?: number): U;
_write(chunk: T, encoding: string, callback: Function): void;
write(chunk: T, cb?: Function): boolean;
write(chunk: T, encoding?: any, cb?: Function): boolean;
end(): void;
end(chunk: T, cb?: Function): void;
end(chunk: T, encoding?: any, cb?: Function): void;
} & Duplex &
ObjectWritable<T> &
ObjectReadable<U>;

5
packages/grpc-js/src/server-call.ts
View File

@ -236,7 +236,7 @@ export class ServerWritableStreamImpl<RequestType, ResponseType>
this.trailingMetadata = metadata; this.trailingMetadata = metadata;
} }
super.end(); return super.end();
} }
} }
@ -282,7 +282,7 @@ export class ServerDuplexStreamImpl<RequestType, ResponseType>
this.trailingMetadata = metadata; this.trailingMetadata = metadata;
} }
super.end(); return super.end();
} }
} }
@ -292,7 +292,6 @@ ServerDuplexStreamImpl.prototype._write =
ServerWritableStreamImpl.prototype._write; ServerWritableStreamImpl.prototype._write;
ServerDuplexStreamImpl.prototype._final = ServerDuplexStreamImpl.prototype._final =
ServerWritableStreamImpl.prototype._final; ServerWritableStreamImpl.prototype._final;
ServerDuplexStreamImpl.prototype.end = ServerWritableStreamImpl.prototype.end;
// Unary response callback signature. // Unary response callback signature.
export type sendUnaryData<ResponseType> = ( export type sendUnaryData<ResponseType> = (