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 #577 from murgatroid99/proto_loader_abs_path_fix 

@grpc/proto-loader: Fix absolute path handling and improve reporting of loading failures
This commit is contained in:
Michael Lumish 2018-10-18 09:03:37 -07:00 committed by GitHub
parent 568203cc25 6364d0a92f
commit eddfe265bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/grpc-protobufjs/src/index.ts
View File

@ -119,6 +119,9 @@ function createPackageDefinition(root: Protobuf.Root, options: Options): Package
function addIncludePathResolver(root: Protobuf.Root, includePaths: string[]) {
root.resolvePath = (origin: string, target: string) => {
if (path.isAbsolute(target)) {
return target;
}
for (const directory of includePaths) {
const fullPath: string = path.join(directory, target);
try {
@ -128,7 +131,7 @@ function addIncludePathResolver(root: Protobuf.Root, includePaths: string[]) {
continue;
}
}
return null;
throw new Error(`Could not find file ${target}`);
};
}