chore: Bump dependencies. (stephenh#879)

* chore: Bump dependencies. * Fix dataloader typing.
own2pwn · Jul 13, 2023 · 7bb85d4 · 7bb85d4
1 parent ebb65ca
commit 7bb85d4
Show file tree

Hide file tree

Showing 20 changed files with 874 additions and 537 deletions.
diff --git a/integration/batching-with-context-esModuleInterop/batching.ts b/integration/batching-with-context-esModuleInterop/batching.ts
@@ -686,9 +686,9 @@ export class EntityServiceClientImpl<Context extends DataLoaders> implements Ent
   }
   GetQuery(ctx: Context, id: string): Promise<Entity> {
     const dl = ctx.getDataLoader("batching.EntityService.BatchQuery", () => {
-      return new DataLoader<string, Entity>((ids) => {
+      return new DataLoader<string, Entity, string>((ids) => {
         const request = { ids };
-        return this.BatchQuery(ctx, request).then((res) => res.entities);
+        return this.BatchQuery(ctx, request as any).then((res) => res.entities);
       }, { cacheKeyFn: hash, ...ctx.rpcDataLoaderOptions });
     });
     return dl.load(id);
@@ -702,9 +702,9 @@ export class EntityServiceClientImpl<Context extends DataLoaders> implements Ent
 
   GetMapQuery(ctx: Context, id: string): Promise<Entity> {
     const dl = ctx.getDataLoader("batching.EntityService.BatchMapQuery", () => {
-      return new DataLoader<string, Entity>((ids) => {
+      return new DataLoader<string, Entity, string>((ids) => {
         const request = { ids };
-        return this.BatchMapQuery(ctx, request).then((res) => {
+        return this.BatchMapQuery(ctx, request as any).then((res) => {
           return ids.map((key) => res.entities[key] ?? fail());
         });
       }, { cacheKeyFn: hash, ...ctx.rpcDataLoaderOptions });
@@ -720,7 +720,7 @@ export class EntityServiceClientImpl<Context extends DataLoaders> implements Ent
 
   GetOnlyMethod(ctx: Context, request: GetOnlyMethodRequest): Promise<GetOnlyMethodResponse> {
     const dl = ctx.getDataLoader("batching.EntityService.GetOnlyMethod", () => {
-      return new DataLoader<GetOnlyMethodRequest, GetOnlyMethodResponse>((requests) => {
+      return new DataLoader<GetOnlyMethodRequest, GetOnlyMethodResponse, string>((requests) => {
         const responses = requests.map(async (request) => {
           const data = GetOnlyMethodRequest.encode(request).finish();
           const response = await this.rpc.request(ctx, "batching.EntityService", "GetOnlyMethod", data);

diff --git a/integration/batching-with-context/batching.ts b/integration/batching-with-context/batching.ts
@@ -686,9 +686,9 @@ export class EntityServiceClientImpl<Context extends DataLoaders> implements Ent
   }
   GetQuery(ctx: Context, id: string): Promise<Entity> {
     const dl = ctx.getDataLoader("batching.EntityService.BatchQuery", () => {
-      return new DataLoader<string, Entity>((ids) => {
+      return new DataLoader<string, Entity, string>((ids) => {
         const request = { ids };
-        return this.BatchQuery(ctx, request).then((res) => res.entities);
+        return this.BatchQuery(ctx, request as any).then((res) => res.entities);
       }, { cacheKeyFn: hash, ...ctx.rpcDataLoaderOptions });
     });
     return dl.load(id);
@@ -702,9 +702,9 @@ export class EntityServiceClientImpl<Context extends DataLoaders> implements Ent
 
   GetMapQuery(ctx: Context, id: string): Promise<Entity> {
     const dl = ctx.getDataLoader("batching.EntityService.BatchMapQuery", () => {
-      return new DataLoader<string, Entity>((ids) => {
+      return new DataLoader<string, Entity, string>((ids) => {
         const request = { ids };
-        return this.BatchMapQuery(ctx, request).then((res) => {
+        return this.BatchMapQuery(ctx, request as any).then((res) => {
           return ids.map((key) => res.entities[key] ?? fail());
         });
       }, { cacheKeyFn: hash, ...ctx.rpcDataLoaderOptions });
@@ -720,7 +720,7 @@ export class EntityServiceClientImpl<Context extends DataLoaders> implements Ent
 
   GetOnlyMethod(ctx: Context, request: GetOnlyMethodRequest): Promise<GetOnlyMethodResponse> {
     const dl = ctx.getDataLoader("batching.EntityService.GetOnlyMethod", () => {
-      return new DataLoader<GetOnlyMethodRequest, GetOnlyMethodResponse>((requests) => {
+      return new DataLoader<GetOnlyMethodRequest, GetOnlyMethodResponse, string>((requests) => {
         const responses = requests.map(async (request) => {
           const data = GetOnlyMethodRequest.encode(request).finish();
           const response = await this.rpc.request(ctx, "batching.EntityService", "GetOnlyMethod", data);

diff --git a/integration/lower-case-svc-methods/math.ts b/integration/lower-case-svc-methods/math.ts
@@ -246,9 +246,9 @@ export class MathServiceClientImpl<Context extends DataLoaders> implements MathS
 
   getDouble(ctx: Context, nu: number): Promise<number> {
     const dl = ctx.getDataLoader("MathService.BatchDouble", () => {
-      return new DataLoader<number, number>((num) => {
+      return new DataLoader<number, number, string>((num) => {
         const request = { num };
-        return this.batchDouble(ctx, request).then((res) => res.num);
+        return this.batchDouble(ctx, request as any).then((res) => res.num);
       }, { cacheKeyFn: hash, ...ctx.rpcDataLoaderOptions });
     });
     return dl.load(nu);

diff --git a/package.json b/package.json
@@ -29,43 +29,43 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@grpc/grpc-js": "^1.8.14",
-    "@grpc/proto-loader": "^0.7.7",
-    "@improbable-eng/grpc-web": "^0.14.0",
-    "@improbable-eng/grpc-web-node-http-transport": "^0.14.0",
-    "@nestjs/common": "^9.4.2",
-    "@nestjs/core": "^9.4.2",
-    "@nestjs/microservices": "^9.4.2",
+    "@grpc/grpc-js": "^1.8.17",
+    "@grpc/proto-loader": "^0.7.8",
+    "@improbable-eng/grpc-web": "^0.14.1",
+    "@improbable-eng/grpc-web-node-http-transport": "^0.14.1",
+    "@nestjs/common": "^9.4.3",
+    "@nestjs/core": "^9.4.3",
+    "@nestjs/microservices": "^9.4.3",
     "@semantic-release/changelog": "^6.0.3",
-    "@semantic-release/commit-analyzer": "^10.0.0",
+    "@semantic-release/commit-analyzer": "^10.0.1",
     "@semantic-release/exec": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
-    "@semantic-release/github": "^9.0.2",
-    "@semantic-release/npm": "^10.0.3",
-    "@semantic-release/release-notes-generator": "^11.0.2",
+    "@semantic-release/github": "^9.0.3",
+    "@semantic-release/npm": "^10.0.4",
+    "@semantic-release/release-notes-generator": "^11.0.4",
     "@tsconfig/strictest": "^2.0.1",
-    "@types/jest": "^29.5.2",
+    "@types/jest": "^29.5.3",
     "@types/node": "^16.18.38",
     "@types/object-hash": "^3.0.2",
     "chokidar": "^3.5.3",
-    "dataloader": "^1.4.0",
-    "jest": "^29.5.0",
+    "dataloader": "^2.2.2",
+    "jest": "^29.6.1",
     "jest-ts-webcompat-resolver": "^1.0.0",
-    "mongodb": "^4.3.0",
+    "mongodb": "^5.7.0",
     "nice-grpc": "^2.1.4",
     "object-hash": "^3.0.0",
-    "prettier": "^2.8.8",
+    "prettier": "^3.0.0",
     "protobufjs-cli": "^1.1.1",
     "reflect-metadata": "^0.1.13",
-    "rxjs": "^7.4.0",
-    "semantic-release": "^21.0.3",
-    "ts-jest": "^29.1.0",
+    "rxjs": "^7.8.1",
+    "semantic-release": "^21.0.7",
+    "ts-jest": "^29.1.1",
     "tsx": "^3.12.7",
-    "typescript": "^5.1.3",
+    "typescript": "^5.1.6",
     "uglify-js": "^3.17.4"
   },
   "dependencies": {
-    "case-anything": "^2.1.10",
+    "case-anything": "^2.1.13",
     "protobufjs": "^7.2.4",
     "ts-poet": "^6.4.1",
     "ts-proto-descriptors": "1.11.0"

diff --git a/src/enums.ts b/src/enums.ts
@@ -13,7 +13,7 @@ export function generateEnum(
   ctx: Context,
   fullName: string,
   enumDesc: EnumDescriptorProto,
-  sourceInfo: SourceInfo
+  sourceInfo: SourceInfo,
 ): Code {
   const { options } = ctx;
   const chunks: Code[] = [];
@@ -34,15 +34,15 @@ export function generateEnum(
     const memberName = getMemberName(ctx, fullName, valueDesc);
     maybeAddComment(info, chunks, valueDesc.options?.deprecated, `${memberName} - `);
     chunks.push(
-      code`${memberName} ${delimiter} ${options.stringEnums ? `"${valueName}"` : valueDesc.number.toString()},`
+      code`${memberName} ${delimiter} ${options.stringEnums ? `"${valueName}"` : valueDesc.number.toString()},`,
     );
   });
 
   if (options.unrecognizedEnum)
     chunks.push(code`
       ${UNRECOGNIZED_ENUM_NAME} ${delimiter} ${
-      options.stringEnums ? `"${UNRECOGNIZED_ENUM_NAME}"` : UNRECOGNIZED_ENUM_VALUE.toString()
-    },`);
+        options.stringEnums ? `"${UNRECOGNIZED_ENUM_NAME}"` : UNRECOGNIZED_ENUM_VALUE.toString()
+      },`);
 
   if (options.enumsAsLiterals) {
     chunks.push(code`} as const`);
@@ -117,7 +117,7 @@ export function generateEnumToJson(ctx: Context, fullName: string, enumDesc: Enu
   chunks.push(
     code`export function ${def(functionName)}(object: ${fullName}): ${
       ctx.options.useNumericEnumForJson ? "number" : "string"
-    } {`
+    } {`,
   );
   chunks.push(code`switch (object) {`);
 

diff --git a/src/generate-generic-service-definition.ts b/src/generate-generic-service-definition.ts
@@ -19,7 +19,7 @@ export function generateGenericServiceDefinition(
   ctx: Context,
   fileDesc: FileDescriptorProto,
   sourceInfo: SourceInfo,
-  serviceDesc: ServiceDescriptorProto
+  serviceDesc: ServiceDescriptorProto,
 ) {
   const chunks: Code[] = [];
 
@@ -99,7 +99,7 @@ function generateMethodOptions(ctx: Context, options: MethodOptions | undefined)
 
         for (const value of values) {
           valuesChunks.push(
-            code`${ctx.options.env == "node" ? "Buffer.from" : "new Uint8Array"}([${value.join(", ")}])`
+            code`${ctx.options.env == "node" ? "Buffer.from" : "new Uint8Array"}([${value.join(", ")}])`,
           );
         }
 

diff --git a/src/generate-grpc-js.ts b/src/generate-grpc-js.ts
@@ -31,7 +31,7 @@ export function generateGrpcJsService(
   ctx: Context,
   fileDesc: FileDescriptorProto,
   sourceInfo: SourceInfo,
-  serviceDesc: ServiceDescriptorProto
+  serviceDesc: ServiceDescriptorProto,
 ): Code {
   const { options } = ctx;
   const chunks: Code[] = [];
@@ -50,7 +50,7 @@ function generateServiceDefinition(
   ctx: Context,
   fileDesc: FileDescriptorProto,
   sourceInfo: SourceInfo,
-  serviceDesc: ServiceDescriptorProto
+  serviceDesc: ServiceDescriptorProto,
 ) {
   const chunks: Code[] = [];
 

diff --git a/src/generate-grpc-web.ts b/src/generate-grpc-web.ts
@@ -13,7 +13,7 @@ const BrowserHeaders = imp("BrowserHeaders@browser-headers");
 export function generateGrpcClientImpl(
   ctx: Context,
   _fileDesc: FileDescriptorProto,
-  serviceDesc: ServiceDescriptorProto
+  serviceDesc: ServiceDescriptorProto,
 ): Code {
   const chunks: Code[] = [];
 
@@ -102,7 +102,7 @@ export function generateGrpcServiceDesc(fileDesc: FileDescriptorProto, serviceDe
 export function generateGrpcMethodDesc(
   ctx: Context,
   serviceDesc: ServiceDescriptorProto,
-  methodDesc: MethodDescriptorProto
+  methodDesc: MethodDescriptorProto,
 ): Code {
   const inputType = requestType(ctx, methodDesc);
   const outputType = responseType(ctx, methodDesc);

diff --git a/src/generate-nestjs.ts b/src/generate-nestjs.ts
@@ -19,7 +19,7 @@ export function generateNestjsServiceController(
   ctx: Context,
   fileDesc: FileDescriptorProto,
   sourceInfo: SourceInfo,
-  serviceDesc: ServiceDescriptorProto
+  serviceDesc: ServiceDescriptorProto,
 ): Code {
   const { options } = ctx;
   const chunks: Code[] = [];
@@ -92,7 +92,7 @@ export function generateNestjsServiceClient(
   ctx: Context,
   fileDesc: FileDescriptorProto,
   sourceInfo: SourceInfo,
-  serviceDesc: ServiceDescriptorProto
+  serviceDesc: ServiceDescriptorProto,
 ): Code {
   const { options } = ctx;
   const chunks: Code[] = [];

diff --git a/src/generate-nice-grpc.ts b/src/generate-nice-grpc.ts
@@ -16,7 +16,7 @@ export function generateNiceGrpcService(
   ctx: Context,
   fileDesc: FileDescriptorProto,
   sourceInfo: SourceInfo,
-  serviceDesc: ServiceDescriptorProto
+  serviceDesc: ServiceDescriptorProto,
 ): Code {
   const chunks: Code[] = [];
 

diff --git a/src/generate-services.ts b/src/generate-services.ts
@@ -35,7 +35,7 @@ export function generateService(
   ctx: Context,
   fileDesc: FileDescriptorProto,
   sourceInfo: SourceInfo,
-  serviceDesc: ServiceDescriptorProto
+  serviceDesc: ServiceDescriptorProto,
 ): Code {
   const { options } = ctx;
   const chunks: Code[] = [];
@@ -82,8 +82,8 @@ export function generateService(
     chunks.push(
       code`${methodDesc.formattedName}(${joinCode(params, { on: "," })}): ${responsePromiseOrObservable(
         ctx,
-        methodDesc
-      )};`
+        methodDesc,
+      )};`,
     );
 
     // If this is a batch method, auto-generate the singular version of it
@@ -176,7 +176,7 @@ function generateRegularRpcMethod(ctx: Context, methodDesc: MethodDescriptorProt
 export function generateServiceClientImpl(
   ctx: Context,
   fileDesc: FileDescriptorProto,
-  serviceDesc: ServiceDescriptorProto
+  serviceDesc: ServiceDescriptorProto,
 ): Code {
   const { options } = ctx;
   const chunks: Code[] = [];
@@ -258,14 +258,14 @@ function generateBatchingRpcMethod(ctx: Context, batchMethod: BatchMethod): Code
   if (mapType) {
     // If the return type is a map, lookup each key in the result
     lambda.push(code`
-      return this.${methodDesc.formattedName}(ctx, request).then(res => {
+      return this.${methodDesc.formattedName}(ctx, request as any).then(res => {
         return ${inputFieldName}.map(key => res.${outputFieldName}[key] ?? ${ctx.utils.fail}())
       });
     `);
   } else {
     // Otherwise assume they come back in order
     lambda.push(code`
-      return this.${methodDesc.formattedName}(ctx, request).then(res => res.${outputFieldName})
+      return this.${methodDesc.formattedName}(ctx, request as any).then(res => res.${outputFieldName})
     `);
   }
   lambda.push(code`}`);
@@ -276,7 +276,7 @@ function generateBatchingRpcMethod(ctx: Context, batchMethod: BatchMethod): Code
       ${singular(inputFieldName)}: ${inputType}
     ): Promise<${outputType}> {
       const dl = ctx.getDataLoader("${uniqueIdentifier}", () => {
-        return new ${dataloader}<${inputType}, ${outputType}>(
+        return new ${dataloader}<${inputType}, ${outputType}, string>(
           ${joinCode(lambda)},
           { cacheKeyFn: ${hash}, ...ctx.rpcDataLoaderOptions }
         );
@@ -291,7 +291,7 @@ function generateCachingRpcMethod(
   ctx: Context,
   fileDesc: FileDescriptorProto,
   serviceDesc: ServiceDescriptorProto,
-  methodDesc: MethodDescriptorProto
+  methodDesc: MethodDescriptorProto,
 ): Code {
   assertInstanceOf(methodDesc, FormattedMethodDescriptor);
 
@@ -309,8 +309,8 @@ function generateCachingRpcMethod(
       const responses = requests.map(async request => {
         const data = ${inputType}.encode(request).finish()
         const response = await this.rpc.request(ctx, "${maybePrefixPackage(fileDesc, serviceDesc.name)}", "${
-    methodDesc.name
-  }", data);
+          methodDesc.name
+        }", data);
         return ${outputType}.decode(${Reader}.create(response));
       });
       return Promise.all(responses);
@@ -323,7 +323,7 @@ function generateCachingRpcMethod(
       request: ${inputType},
     ): Promise<${outputType}> {
       const dl = ctx.getDataLoader("${uniqueIdentifier}", () => {
-        return new ${dataloader}<${inputType}, ${outputType}>(
+        return new ${dataloader}<${inputType}, ${outputType}, string>(
           ${lambda},
           { cacheKeyFn: ${hash}, ...ctx.rpcDataLoaderOptions },
         );