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

proto-loader: update fromJSON

This commit is contained in:
sovlookup 2021-03-17 09:32:02 +08:00
parent c2d7e4adda
commit 550a4e93f5
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -399,17 +399,10 @@ export function fromJSON(
json: Protobuf.INamespace,
root?: Protobuf.Root
): PackageDefinition {
const options: Options = json.options || {};
const newRoot: Protobuf.Root = root || new Protobuf.Root();
if (!!options.includeDirs) {
if (!Array.isArray(options.includeDirs)) {
throw new Error('The includeDirs option must be an array');
}
addIncludePathResolver(newRoot, options.includeDirs as string[]);
}
const loadedRoot = Protobuf.Root.fromJSON(json, newRoot);
loadedRoot.resolveAll();
return createPackageDefinition(newRoot, options!);
return createPackageDefinition(newRoot, {});
}
export function loadFileDescriptorSetFromBuffer(