From 8568937691c2c6aa9a90cbbe775819510720badb Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 24 Jan 2025 16:36:17 +0300 Subject: [PATCH 1/2] fix(nestjs-grpc-reflection): proto index file --- packages/nestjs-grpc-reflection/package.json | 10 +++++----- .../proto/{index.js => index.cjs} | 0 2 files changed, 5 insertions(+), 5 deletions(-) rename packages/nestjs-grpc-reflection/proto/{index.js => index.cjs} (100%) diff --git a/packages/nestjs-grpc-reflection/package.json b/packages/nestjs-grpc-reflection/package.json index b3e1f833..7c124b22 100644 --- a/packages/nestjs-grpc-reflection/package.json +++ b/packages/nestjs-grpc-reflection/package.json @@ -1,13 +1,13 @@ { "name": "@atls/nestjs-grpc-reflection", - "version": "1.0.4", + "version": "1.0.5", "license": "BSD-3-Clause", "type": "module", "exports": { ".": "./src/index.ts", "./proto": { - "import": "./proto/index.js", - "require": "./proto/index.js", + "import": "./proto/index.cjs", + "require": "./proto/index.cjs", "types": "./proto/index.d.ts" } }, @@ -62,8 +62,8 @@ "default": "./dist/index.js" }, "./proto": { - "import": "./proto/index.js", - "require": "./proto/index.js", + "import": "./proto/index.cjs", + "require": "./proto/index.cjs", "types": "./proto/index.d.ts" } }, diff --git a/packages/nestjs-grpc-reflection/proto/index.js b/packages/nestjs-grpc-reflection/proto/index.cjs similarity index 100% rename from packages/nestjs-grpc-reflection/proto/index.js rename to packages/nestjs-grpc-reflection/proto/index.cjs From 47b22efe6249f9878bc82aedf021000770afc4b9 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 24 Jan 2025 16:37:59 +0300 Subject: [PATCH 2/2] fix(nestjs-grpc-reflection): import file-descriptor-proto --- .../src/grpc/grpc-services.registry.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/nestjs-grpc-reflection/src/grpc/grpc-services.registry.ts b/packages/nestjs-grpc-reflection/src/grpc/grpc-services.registry.ts index a722e0e6..301947d9 100644 --- a/packages/nestjs-grpc-reflection/src/grpc/grpc-services.registry.ts +++ b/packages/nestjs-grpc-reflection/src/grpc/grpc-services.registry.ts @@ -1,7 +1,7 @@ import type { ServiceDefinition } from '@grpc/proto-loader' import { Injectable } from '@nestjs/common' -import { FileDescriptorProto } from 'google-protobuf/google/protobuf/descriptor_pb.js' +import google from 'google-protobuf/google/protobuf/descriptor_pb.js' @Injectable() export class GrpcServicesRegistry { @@ -27,7 +27,7 @@ export class GrpcServicesRegistry { getFileDescriptorProtoByFileContainingSymbol( fileContainingSymbol: string - ): FileDescriptorProto | undefined { + ): google.FileDescriptorProto | undefined { // @ts-expect-error correct return type return this.services.reduce((fileDescriptorProto, service) => { if (fileDescriptorProto) { @@ -44,7 +44,7 @@ export class GrpcServicesRegistry { if (method.path.includes(fileContainingSymbol)) { return method.requestType.fileDescriptorProtos.find((fdp) => { - const fileDescriptor = FileDescriptorProto.deserializeBinary(fdp) + const fileDescriptor = google.FileDescriptorProto.deserializeBinary(fdp) const filePackage = fileDescriptor.getPackage()