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

Fixed load/loadSync filename parameter type 

Fixes #805.

Changed the type of the filename parameter to the proto-loader load
method to match the type of the protobuf.js load method that it is
passed to.

Signed-off-by: James Roper <james@jazzy.id.au>
This commit is contained in:
James Roper 2019-03-29 16:03:51 +11:00
parent f345593d1d
commit 7f85a775d6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/proto-loader/src/index.ts
View File

@ -243,8 +243,8 @@ function addIncludePathResolver(root: Protobuf.Root, includePaths: string[]) {
/**
* Load a .proto file with the specified options.
* @param filename The file path to load. Can be an absolute path or relative to
* an include path.
* @param filename One or multiple file paths to load. Can be an absolute path
* or relative to an include path.
* @param options.keepCase Preserve field names. The default is to change them
* to camel case.
* @param options.longs The type that should be used to represent `long` values.
@ -265,7 +265,7 @@ function addIncludePathResolver(root: Protobuf.Root, includePaths: string[]) {
* name
* @param options.includeDirs Paths to search for imported `.proto` files.
*/
export function load(filename: string, options?: Options): Promise<PackageDefinition> {
export function load(filename: string | string[], options?: Options): Promise<PackageDefinition> {
const root: Protobuf.Root = new Protobuf.Root();
options = options || {};
if (!!options.includeDirs) {
@ -280,7 +280,7 @@ export function load(filename: string, options?: Options): Promise<PackageDefini
});
}
export function loadSync(filename: string, options?: Options): PackageDefinition {
export function loadSync(filename: string | string[], options?: Options): PackageDefinition {
const root: Protobuf.Root = new Protobuf.Root();
options = options || {};
if (!!options.includeDirs) {