From b9d8d4ca4f099138ae7fa0ea873f50cd669653d6 Mon Sep 17 00:00:00 2001 From: Moritz Bar Date: Wed, 10 Jul 2024 13:11:04 +0200 Subject: [PATCH] Merge provided `loaderOptions` into `defaultLoaderOptions`. --- src/index.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index c5cfdfa..f885dc3 100644 --- a/src/index.ts +++ b/src/index.ts @@ -55,9 +55,14 @@ const defaultLoaderOptions = { oneofs: true } -export async function makeRequest (proto: string | string[], { beforeRequest, afterResponse, loaderOptions = defaultLoaderOptions, options = {}, ...clientConfig }: gRPCRequest): Promise { +export async function makeRequest (proto: string | string[], { beforeRequest, afterResponse, loaderOptions = {}, options = {}, ...clientConfig }: gRPCRequest): Promise { return new Promise(async (resolve, reject) => { try { + loaderOptions = { + ...loaderOptions ?? {}, + ...defaultLoaderOptions + }; + const packageDefinition = await protoLoader.load(proto, loaderOptions) as any const { requestSerialize, responseDeserialize, requestStream, responseStream } = packageDefinition[clientConfig.service][clientConfig.method]