@hodfords/nestjs-grpc-helper 11.4.0-rc.8 → 11.4.0-rc.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,4 +3,3 @@ export declare const FLATTEN_PARAMETERS_METADATA_KEY = "grpc:flatten-parameters"
3
3
  export declare const GRPC_PARAM_INDEX_METADATA_KEY = "grpc:parameter-index";
4
4
  export declare const GRPC_DESCRIPTION_METADATA_KEY = "grpc:description";
5
5
  export declare const GRPC_METHOD_METADATA_KEY = "grpc:method";
6
- export declare const GRPC_NULLABLE_RESPONSE_METADATA_KEY = "grpc:nullable-response";
@@ -1,10 +1,9 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.GRPC_NULLABLE_RESPONSE_METADATA_KEY = exports.GRPC_METHOD_METADATA_KEY = exports.GRPC_DESCRIPTION_METADATA_KEY = exports.GRPC_PARAM_INDEX_METADATA_KEY = exports.FLATTEN_PARAMETERS_METADATA_KEY = exports.DIRECT_PARAMETERS_METADATA_KEY = void 0;
3
+ exports.GRPC_METHOD_METADATA_KEY = exports.GRPC_DESCRIPTION_METADATA_KEY = exports.GRPC_PARAM_INDEX_METADATA_KEY = exports.FLATTEN_PARAMETERS_METADATA_KEY = exports.DIRECT_PARAMETERS_METADATA_KEY = void 0;
4
4
  exports.DIRECT_PARAMETERS_METADATA_KEY = 'grpc:direct-parameters';
5
5
  exports.FLATTEN_PARAMETERS_METADATA_KEY = 'grpc:flatten-parameters';
6
6
  exports.GRPC_PARAM_INDEX_METADATA_KEY = 'grpc:parameter-index';
7
7
  exports.GRPC_DESCRIPTION_METADATA_KEY = 'grpc:description';
8
8
  exports.GRPC_METHOD_METADATA_KEY = 'grpc:method';
9
- exports.GRPC_NULLABLE_RESPONSE_METADATA_KEY = 'grpc:nullable-response';
10
9
  //# sourceMappingURL=metadata-key.const.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"metadata-key.const.js","sourceRoot":"","sources":["../../../lib/constants/metadata-key.const.ts"],"names":[],"mappings":";;;AAAa,QAAA,8BAA8B,GAAG,wBAAwB,CAAC;AAC1D,QAAA,+BAA+B,GAAG,yBAAyB,CAAC;AAC5D,QAAA,6BAA6B,GAAG,sBAAsB,CAAC;AACvD,QAAA,6BAA6B,GAAG,kBAAkB,CAAC;AACnD,QAAA,wBAAwB,GAAG,aAAa,CAAC;AACzC,QAAA,mCAAmC,GAAG,wBAAwB,CAAC"}
1
+ {"version":3,"file":"metadata-key.const.js","sourceRoot":"","sources":["../../../lib/constants/metadata-key.const.ts"],"names":[],"mappings":";;;AAAa,QAAA,8BAA8B,GAAG,wBAAwB,CAAC;AAC1D,QAAA,+BAA+B,GAAG,yBAAyB,CAAC;AAC5D,QAAA,6BAA6B,GAAG,sBAAsB,CAAC;AACvD,QAAA,6BAA6B,GAAG,kBAAkB,CAAC;AACnD,QAAA,wBAAwB,GAAG,aAAa,CAAC"}
package/index.d.ts CHANGED
@@ -5,7 +5,6 @@ export * from './decorators/grpc-value.decorator';
5
5
  export * from './decorators/grpc-param.decorator';
6
6
  export * from './decorators/extend-type.decorator';
7
7
  export * from './decorators/any-type.decorator';
8
- export * from './decorators/grpc-nullable-response.decorator';
9
8
  export * from './helpers/generate.helper';
10
9
  export * from './helpers/mock.helper';
11
10
  export * from './type-helpers/pick-type.helper';
package/index.js CHANGED
@@ -21,7 +21,6 @@ __exportStar(require("./decorators/grpc-value.decorator"), exports);
21
21
  __exportStar(require("./decorators/grpc-param.decorator"), exports);
22
22
  __exportStar(require("./decorators/extend-type.decorator"), exports);
23
23
  __exportStar(require("./decorators/any-type.decorator"), exports);
24
- __exportStar(require("./decorators/grpc-nullable-response.decorator"), exports);
25
24
  __exportStar(require("./helpers/generate.helper"), exports);
26
25
  __exportStar(require("./helpers/mock.helper"), exports);
27
26
  __exportStar(require("./type-helpers/pick-type.helper"), exports);
package/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sEAAoD;AACpD,kEAAgD;AAChD,8DAA4C;AAC5C,oEAAkD;AAClD,oEAAkD;AAClD,qEAAmD;AACnD,kEAAgD;AAChD,gFAA8D;AAC9D,4DAA0C;AAC1C,wDAAsC;AACtC,kEAAgD;AAChD,kEAAgD;AAChD,qEAAmD;AACnD,0EAAwD;AACxD,+DAA6C;AAC7C,gEAA8C;AAC9C,iEAA+C;AAC/C,2EAAyD;AACzD,+DAA6C;AAC7C,4DAA0C;AAC1C,8EAA4D;AAC5D,uCAAqC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sEAAoD;AACpD,kEAAgD;AAChD,8DAA4C;AAC5C,oEAAkD;AAClD,oEAAkD;AAClD,qEAAmD;AACnD,kEAAgD;AAChD,4DAA0C;AAC1C,wDAAsC;AACtC,kEAAgD;AAChD,kEAAgD;AAChD,qEAAmD;AACnD,0EAAwD;AACxD,+DAA6C;AAC7C,gEAA8C;AAC9C,iEAA+C;AAC/C,2EAAyD;AACzD,+DAA6C;AAC7C,4DAA0C;AAC1C,8EAA4D;AAC5D,uCAAqC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hodfords/nestjs-grpc-helper",
3
- "version": "11.4.0-rc.8",
3
+ "version": "11.4.0-rc.9",
4
4
  "description": "A utility for simplifying gRPC integration and communication in NestJS applications",
5
5
  "author": "",
6
6
  "license": "UNLICENSED",
@@ -51,7 +51,7 @@ class GrpcHelper {
51
51
  if (data.grpcNative) {
52
52
  data = data.value;
53
53
  }
54
- if (data.nullableGrpcResponse) {
54
+ if (data.grpcNullable) {
55
55
  return data.value;
56
56
  }
57
57
  if (Array.isArray(data)) {
@@ -1 +1 @@
1
- {"version":3,"file":"grpc.helper.js","sourceRoot":"","sources":["../../../../lib/sdk-stub/helpers/grpc.helper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"grpc.helper.js","sourceRoot":"","sources":["../../../../lib/sdk-stub/helpers/grpc.helper.ts"],"names":[],"mappings":"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"}
@@ -65,7 +65,7 @@ export class GrpcHelper<Model> {
65
65
  if (data.grpcNative) {
66
66
  data = data.value;
67
67
  }
68
- if (data.nullableGrpcResponse) {
68
+ if (data.grpcNullable) {
69
69
  return data.value;
70
70
  }
71
71
 
@@ -97,7 +97,11 @@ class GenerateProtoService extends hbs_generator_service_1.HbsGeneratorService {
97
97
  }
98
98
  generateNullableWrapperMessages() {
99
99
  return Array.from(this.nullableResponseTypes).map((typeName) => {
100
- return `message GrpcNullable${typeName} {\n\t${typeName} value = 1;\n\t bool nullableGrpcResponse = 2;\n}`;
100
+ return `message ${nestjs_response_1.NullableGrpcClassResponseNamePrefix}${typeName} {
101
+ \t${typeName} value = 1;
102
+ \tbool grpcNullable = 2;
103
+ }
104
+ `;
101
105
  });
102
106
  }
103
107
  getProtoType(option) {
@@ -147,26 +151,21 @@ class GenerateProtoService extends hbs_generator_service_1.HbsGeneratorService {
147
151
  if (!(0, shared_utils_1.isUndefined)(parameterIndex)) {
148
152
  parameterName = params[parameterIndex].name;
149
153
  }
150
- const nullableResponseClass = Reflect.getMetadata(metadata_key_const_1.GRPC_NULLABLE_RESPONSE_METADATA_KEY, constructor.prototype, propertyKey);
154
+ const response = Reflect.getMetadata(nestjs_response_1.RESPONSE_METADATA_KEY, constructor.prototype[propertyKey]);
151
155
  let returnType = 'google.protobuf.Empty';
152
- if (nullableResponseClass) {
153
- const baseTypeName = nullableResponseClass.name;
154
- const wrapperTypeName = `GrpcNullable${baseTypeName}`;
155
- this.nullableResponseTypes.add(baseTypeName);
156
- returnType = wrapperTypeName;
157
- }
158
- else {
159
- const response = Reflect.getMetadata(nestjs_response_1.RESPONSE_METADATA_KEY, constructor.prototype[propertyKey]);
160
- if (response) {
161
- if (response.isArray) {
162
- returnType = `Proto${response.responseClass.name}List`;
163
- }
164
- else if ((0, type_helper_1.isPrimitiveType)(response.responseClass)) {
165
- returnType = `Native${response.responseClass.name}Value`;
166
- }
167
- else {
168
- returnType = response.responseClass.name;
169
- }
156
+ if (response) {
157
+ if (response.isArray) {
158
+ returnType = `Proto${response.responseClass.name}List`;
159
+ }
160
+ else if ((0, type_helper_1.isPrimitiveType)(response.responseClass)) {
161
+ returnType = `Native${response.responseClass.name}Value`;
162
+ }
163
+ else if (response.isAllowEmpty) {
164
+ returnType = `${nestjs_response_1.NullableGrpcClassResponseNamePrefix}${response.responseClass.name}`;
165
+ this.nullableResponseTypes.add(response.responseClass.name);
166
+ }
167
+ else {
168
+ returnType = response.responseClass.name;
170
169
  }
171
170
  }
172
171
  return `rpc ${propertyKey} (${parameterName}) returns (${returnType}) {}`;
@@ -1 +1 @@
1
- {"version":3,"file":"generate-proto.service.js","sourceRoot":"","sources":["../../../lib/services/generate-proto.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generate-proto.service.js","sourceRoot":"","sources":["../../../lib/services/generate-proto.service.ts"],"names":[],"mappings":"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"}
@@ -1,6 +0,0 @@
1
- import { ClassConstructor } from 'class-transformer';
2
- export declare function GrpcNullableResponse(responseClass: ClassConstructor<object>, options?: {
3
- isArray?: boolean;
4
- isAllowEmpty?: boolean;
5
- isGrpcNullable?: boolean;
6
- }): MethodDecorator;
@@ -1,17 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.GrpcNullableResponse = GrpcNullableResponse;
4
- const metadata_key_const_1 = require("../constants/metadata-key.const");
5
- const nestjs_response_1 = require("@hodfords/nestjs-response");
6
- const common_1 = require("@nestjs/common");
7
- function GrpcNullableResponse(responseClass, options) {
8
- const responseModelOptions = {
9
- isAllowEmpty: true,
10
- isGrpcNullable: true,
11
- ...options
12
- };
13
- return (0, common_1.applyDecorators)((0, nestjs_response_1.ResponseModel)(responseClass, responseModelOptions), (target, propertyKey) => {
14
- Reflect.defineMetadata(metadata_key_const_1.GRPC_NULLABLE_RESPONSE_METADATA_KEY, responseClass, target, propertyKey);
15
- });
16
- }
17
- //# sourceMappingURL=grpc-nullable-response.decorator.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"grpc-nullable-response.decorator.js","sourceRoot":"","sources":["../../../lib/decorators/grpc-nullable-response.decorator.ts"],"names":[],"mappings":";;AAMA,oDAoBC;AAzBD,wEAAsF;AAEtF,+DAA0D;AAC1D,2CAAiD;AAEjD,SAAgB,oBAAoB,CAChC,aAAuC,EACvC,OAIC;IAED,MAAM,oBAAoB,GAAG;QACzB,YAAY,EAAE,IAAI;QAClB,cAAc,EAAE,IAAI;QACpB,GAAG,OAAO;KACb,CAAC;IAEF,OAAO,IAAA,wBAAe,EAClB,IAAA,+BAAa,EAAC,aAAa,EAAE,oBAAoB,CAAC,EAClD,CAAC,MAAgB,EAAE,WAA4B,EAAE,EAAE;QAC/C,OAAO,CAAC,cAAc,CAAC,wDAAmC,EAAE,aAAa,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IACpG,CAAC,CACJ,CAAC;AACN,CAAC"}