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/proto-loader: Fix absolute path handling and improve reporting of loading failures

Browse Source
This commit is contained in:
murgatroid99 2018-10-17 15:33:57 -07:00
parent fae76dec4a
commit 6364d0a92f
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}`);
};
}