archive-gh-me/grpc-node
1
0
Fork 0
mirror of https://github.com/grpc/grpc-node.git synced 2025-12-08 18:23:54 +00:00
Code Issues Projects Releases Wiki Activity

grpc-js-core: compiler error fixes

Browse Source
This commit is contained in:
Kelvin Jin 2017-12-07 14:20:24 -08:00
parent c1063eb73c
commit 58206feb3f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/grpc-js-core/src/call-credentials.ts
View File

@ -3,7 +3,7 @@ import {map, reduce} from 'lodash';
import {Metadata} from './metadata';
export type CallMetadataGenerator =
(options: Object, cb: (err: Error|null, metadata?: Metadata) => void) =>
(options: {}, cb: (err: Error|null, metadata?: Metadata) => void) =>
void;
/**
@ -15,7 +15,7 @@ export interface CallCredentials {
* Asynchronously generates a new Metadata object.
* @param options Options used in generating the Metadata object.
*/
generateMetadata(options: Object): Promise<Metadata>;
generateMetadata(options: {}): Promise<Metadata>;
/**
* Creates a new CallCredentials object from properties of both this and
* another CallCredentials object. This object's metadata generator will be
@ -28,7 +28,7 @@ export interface CallCredentials {
class ComposedCallCredentials implements CallCredentials {
constructor(private creds: CallCredentials[]) {}
async generateMetadata(options: Object): Promise<Metadata> {
async generateMetadata(options: {}): Promise<Metadata> {
let base: Metadata = new Metadata();
let generated: Metadata[] = await Promise.all(
map(this.creds, (cred) => cred.generateMetadata(options)));
@ -46,7 +46,7 @@ class ComposedCallCredentials implements CallCredentials {
class SingleCallCredentials implements CallCredentials {
constructor(private metadataGenerator: CallMetadataGenerator) {}
async generateMetadata(options: Object): Promise<Metadata> {
async generateMetadata(options: {}): Promise<Metadata> {
return new Promise<Metadata>((resolve, reject) => {
this.metadataGenerator(options, (err, metadata) => {
if (metadata !== undefined) {
@ -64,7 +64,7 @@ class SingleCallCredentials implements CallCredentials {
}
class EmptyCallCredentials implements CallCredentials {
async generateMetadata(options: Object): Promise<Metadata> {
async generateMetadata(options: {}): Promise<Metadata> {
return new Metadata();
}

4
packages/grpc-js-core/src/metadata.ts
View File

@ -194,7 +194,7 @@ export class Metadata {
values.forEach((value) => {
result.add(key, Buffer.from(value, 'base64'));
});
} else {
} else if (values !== undefined) {
result.add(key, Buffer.from(values, 'base64'));
}
} else {
@ -202,7 +202,7 @@ export class Metadata {
values.forEach((value) => {
result.add(key, value);
});
} else {
} else if (values !== undefined) {
result.add(key, values);
}
}