@hodfords/nestjs-grpc-helper 11.0.1 → 11.1.1

package/README.md

@@ -46,7 +46,7 @@ export class UserMicroservice {
 You can use any type if fixed types are not an option. However, since it’s passed as JSON, the performance may not be as optimal as with binary. Consider using binary if performance is a concern.
 
 ```typescript
-@Property({ type: 'any', required: false })
+@Property({ type: String, format: 'any', required: false })
 @AnyType()
 data: any;
 ```

package/decorators/property.decorator.js

@@ -14,9 +14,6 @@ function Property(option) {
         if (option.type == Boolean) {
             option.type = 'bool';
         }
-        if (option.type === 'string' && option?.default === 'any') {
-            option.type = 'any';
-        }
         (0, property_helper_1.addPropertyToStorage)(target.constructor, propertyName, option);
     };
 }

package/decorators/property.decorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"property.decorator.js","sourceRoot":"","sources":["../../../lib/decorators/property.decorator.ts"],"names":[],"mappings":";;AAQA,4BAmBC;AA3BD,6CAA8C;AAC9C,oEAAyE;AACzE,gEAAkE;AAMlE,SAAgB,QAAQ,CAAC,MAA0B;IAC/C,OAAO,UAAU,MAAc,EAAE,YAAoB;QACjD,MAAM,UAAU,GAAG,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,IAAA,6CAAyB,EAAC,MAAM,CAAC,EAAE,CAAC;QAC1E,IAAA,qBAAW,EAAC,UAAU,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QAE9C,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,EAAE,CAAC;YACjD,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjD,CAAC;QACD,IAAI,MAAM,CAAC,IAAI,IAAI,OAAO,EAAE,CAAC;YACzB,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC;QACzB,CAAC;QAGD,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,MAAM,EAAE,OAAO,KAAK,KAAK,EAAE,CAAC;YACxD,MAAM,CAAC,IAAI,GAAG,KAAK,CAAC;QACxB,CAAC;QAED,IAAA,sCAAoB,EAAC,MAAM,CAAC,WAAW,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IACnE,CAAC,CAAC;AACN,CAAC"}
+{"version":3,"file":"property.decorator.js","sourceRoot":"","sources":["../../../lib/decorators/property.decorator.ts"],"names":[],"mappings":";;AAQA,4BAcC;AAtBD,6CAA8C;AAC9C,oEAAyE;AACzE,gEAAkE;AAMlE,SAAgB,QAAQ,CAAC,MAA0B;IAC/C,OAAO,UAAU,MAAc,EAAE,YAAoB;QACjD,MAAM,UAAU,GAAG,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,IAAA,6CAAyB,EAAC,MAAM,CAAC,EAAE,CAAC;QAC1E,IAAA,qBAAW,EAAC,UAAU,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QAE9C,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,EAAE,CAAC;YACjD,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjD,CAAC;QACD,IAAI,MAAM,CAAC,IAAI,IAAI,OAAO,EAAE,CAAC;YACzB,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC;QACzB,CAAC;QAED,IAAA,sCAAoB,EAAC,MAAM,CAAC,WAAW,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IACnE,CAAC,CAAC;AACN,CAAC"}

package/helpers/proto-type.helper.js

@@ -22,10 +22,6 @@ function convertProtoTypeToTypescript(option, isGenerate) {
         return option.enumName;
     }
     if ((0, shared_utils_1.isString)(option.type)) {
-        const numberTypes = ['int32', 'fixed32', 'uint32', 'int64', 'fixed64', 'uint64', 'float', 'double'];
-        if (numberTypes.includes(option.format)) {
-            type = 'number';
-        }
         if (option.type == 'bool') {
             type = 'boolean';
         }

package/helpers/proto-type.helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"proto-type.helper.js","sourceRoot":"","sources":["../../../lib/helpers/proto-type.helper.ts"],"names":[],"mappings":";;AAIA,8DAKC;AAED,oEAyBC;AApCD,oEAAyE;AACzE,+DAAuD;AAGvD,SAAgB,yBAAyB,CAAC,MAA0B;IAChE,IAAI,IAAA,yBAAU,EAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1B,OAAO,MAAM,CAAC,IAAI,CAAC;IACvB,CAAC;IACD,OAAO,4BAA4B,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACvD,CAAC;AAED,SAAgB,4BAA4B,CAAC,MAA0B,EAAE,UAAoB;IACzF,IAAI,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;IACvB,IAAI,IAAA,yBAAU,EAAC,IAAI,CAAC,EAAE,CAAC;QACnB,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,UAAU,EAAE,CAAC;YACrC,OAAQ,MAAM,CAAC,IAAY,EAAE,CAAC,IAAI,CAAC;QACvC,CAAC;QACD,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAED,IAAI,IAAA,oCAAc,EAAC,MAAM,CAAC,EAAE,CAAC;QACzB,OAAO,MAAM,CAAC,QAAQ,CAAC;IAC3B,CAAC;IAED,IAAI,IAAA,uBAAQ,EAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,MAAM,WAAW,GAAG,CAAC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QACpG,IAAI,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YACtC,IAAI,GAAG,QAAQ,CAAC;QACpB,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,EAAE,CAAC;YACxB,IAAI,GAAG,SAAS,CAAC;QACrB,CAAC;IACL,CAAC;IAED,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;AAC3B,CAAC"}
+{"version":3,"file":"proto-type.helper.js","sourceRoot":"","sources":["../../../lib/helpers/proto-type.helper.ts"],"names":[],"mappings":";;AAIA,8DAKC;AAED,oEAoBC;AA/BD,oEAAyE;AACzE,+DAAuD;AAGvD,SAAgB,yBAAyB,CAAC,MAA0B;IAChE,IAAI,IAAA,yBAAU,EAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1B,OAAO,MAAM,CAAC,IAAI,CAAC;IACvB,CAAC;IACD,OAAO,4BAA4B,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACvD,CAAC;AAED,SAAgB,4BAA4B,CAAC,MAA0B,EAAE,UAAoB;IACzF,IAAI,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;IACvB,IAAI,IAAA,yBAAU,EAAC,IAAI,CAAC,EAAE,CAAC;QACnB,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,UAAU,EAAE,CAAC;YACrC,OAAQ,MAAM,CAAC,IAAY,EAAE,CAAC,IAAI,CAAC;QACvC,CAAC;QACD,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAED,IAAI,IAAA,oCAAc,EAAC,MAAM,CAAC,EAAE,CAAC;QACzB,OAAO,MAAM,CAAC,QAAQ,CAAC;IAC3B,CAAC;IAED,IAAI,IAAA,uBAAQ,EAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,EAAE,CAAC;YACxB,IAAI,GAAG,SAAS,CAAC;QACrB,CAAC;IACL,CAAC;IAED,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;AAC3B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hodfords/nestjs-grpc-helper",
-  "version": "11.0.1",
+  "version": "11.1.1",
   "description": "A utility for simplifying gRPC integration and communication in NestJS applications",
   "author": "",
   "license": "UNLICENSED",
@@ -33,8 +33,8 @@
     "lint-staged": "lint-staged"
   },
   "dependencies": {
-    "@faker-js/faker": "^9.0.1",
-    "@grpc/grpc-js": "^1.11.3",
+    "@faker-js/faker": "^9.6.0",
+    "@grpc/grpc-js": "^1.13.0",
     "@grpc/proto-loader": "^0.7.13",
     "chalk": "4.1.2"
   },
@@ -44,48 +44,48 @@
     "@grpc/proto-loader": "^0.7.13"
   },
   "devDependencies": {
-    "@hodfords/nestjs-cls-translation": "11.0.0",
-    "@hodfords/nestjs-command": "11.0.3",
-    "@hodfords/nestjs-eslint-config": "11.0.0",
-    "@hodfords/nestjs-prettier-config": "11.0.0",
-    "@hodfords/nestjs-response": "11.0.0",
-    "@nestjs/cli": "11.0.2",
-    "@nestjs/common": "11.0.8",
-    "@nestjs/core": "11.0.8",
-    "@nestjs/microservices": "11.0.8",
-    "@nestjs/platform-express": "11.0.8",
-    "@nestjs/schematics": "11.0.0",
-    "@nestjs/serve-static": "5.0.2",
-    "@nestjs/swagger": "11.0.3",
-    "@nestjs/testing": "11.0.8",
+    "@hodfords/nestjs-cls-translation": "11.0.2",
+    "@hodfords/nestjs-command": "11.0.4",
+    "@hodfords/nestjs-eslint-config": "11.0.1",
+    "@hodfords/nestjs-prettier-config": "11.0.1",
+    "@hodfords/nestjs-response": "11.0.2",
+    "@nestjs/cli": "11.0.5",
+    "@nestjs/common": "11.0.11",
+    "@nestjs/core": "11.0.11",
+    "@nestjs/microservices": "11.0.11",
+    "@nestjs/platform-express": "11.0.11",
+    "@nestjs/schematics": "11.0.2",
+    "@nestjs/serve-static": "5.0.3",
+    "@nestjs/swagger": "11.0.6",
+    "@nestjs/testing": "11.0.11",
     "@nestjs/typeorm": "11.0.0",
     "@types/express": "5.0.0",
     "@types/jest": "29.5.14",
-    "@types/lodash": "4.17.15",
-    "@types/node": "22.13.1",
+    "@types/lodash": "4.17.16",
+    "@types/node": "22.13.10",
     "@types/supertest": "6.0.2",
     "auto-changelog": "2.5.0",
     "class-transformer": "0.5.1",
     "class-validator": "0.14.1",
-    "cspell": "8.17.3",
-    "eslint": "9.20.0",
+    "cspell": "8.17.5",
+    "eslint": "9.22.0",
     "husky": "9.1.7",
     "is-ci": "4.1.0",
     "jest": "29.7.0",
-    "lint-staged": "15.4.3",
+    "lint-staged": "15.5.0",
     "lodash": "4.17.21",
     "reflect-metadata": "0.2.2",
     "rimraf": "6.0.1",
-    "rxjs": "7.8.1",
+    "rxjs": "7.8.2",
     "source-map-support": "0.5.21",
     "sqlite3": "^5.1.7",
     "supertest": "7.0.0",
-    "ts-jest": "29.2.5",
+    "ts-jest": "29.2.6",
     "ts-loader": "9.5.2",
     "ts-node": "10.9.2",
     "tsconfig-paths": "4.2.0",
-    "typeorm": "0.3.20",
-    "typescript": "5.7.3"
+    "typeorm": "0.3.21",
+    "typescript": "5.8.2"
   },
   "jest": {
     "moduleFileExtensions": [

package/services/generate-proto.service.d.ts

@@ -1,4 +1,5 @@
 import { HbsGeneratorService } from './hbs-generator.service';
+import { PropertyOptionType } from 'lib/types/property-option.type';
 export declare class GenerateProtoService extends HbsGeneratorService {
     private packageName;
     private dirPath;
@@ -6,7 +7,7 @@ export declare class GenerateProtoService extends HbsGeneratorService {
     generate(): void;
     generateModels(): string;
     generateModel(dto: Function, properties: any): string;
-    getProtoType(type: any): string;
+    getProtoType(option: PropertyOptionType): string;
     generateMicroservices(): string;
     generateMicroservice(constructor: Function): string;
     generateRpcMethod(constructor: any, propertyKey: string): string;

package/services/generate-proto.service.js

@@ -44,6 +44,7 @@ const path_1 = __importDefault(require("path"));
 const property_helper_1 = require("../helpers/property.helper");
 const microservice_storage_1 = require("../storages/microservice.storage");
 const hbs_generator_service_1 = require("./hbs-generator.service");
+const lodash_1 = require("lodash");
 class GenerateProtoService extends hbs_generator_service_1.HbsGeneratorService {
     constructor(packageName, dirPath) {
         super();
@@ -71,23 +72,27 @@ class GenerateProtoService extends hbs_generator_service_1.HbsGeneratorService {
     }
     generateModel(dto, properties) {
         const propertyContent = properties
-            .map((property, index) => `${property.option.isArray ? 'repeated ' : ''}${this.getProtoType(property.option.type)} ${property.name} = ${index + 1};`)
+            .map((property, index) => `${property.option.isArray ? 'repeated ' : ''}${this.getProtoType(property.option)} ${property.name} = ${index + 1};`)
             .join('\n\t');
         return this.compileTemplate('service-interface.hbs', {
             propertyContent,
             name: dto.name
         });
     }
-    getProtoType(type) {
+    getProtoType(option) {
+        const { type, format } = option;
         if ((0, shared_utils_1.isFunction)(type)) {
             if (type.name === 'type') {
                 return type().name;
             }
             return type.name;
         }
-        if (type === 'any') {
+        if (format === 'any') {
             return 'string';
         }
+        if (type === 'number' && !(0, lodash_1.isNil)(format)) {
+            return format;
+        }
         return type;
     }
     generateMicroservices() {

package/services/generate-proto.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-proto.service.js","sourceRoot":"","sources":["../../../lib/services/generate-proto.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generate-proto.service.js","sourceRoot":"","sources":["../../../lib/services/generate-proto.service.ts"],"names":[],"mappings":"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"}

package/services/service-template.service.js

@@ -35,24 +35,28 @@ class ServiceTemplateService extends hbs_generator_service_1.HbsGeneratorService
         };
     }
     propertyTemplate(property, type) {
-        const isPrimitiveType = ['object', 'string', 'number', 'bool', 'boolean', 'any'].includes(type);
-        const isEnumType = (0, api_property_helper_1.isEnumProperty)(property.option);
+        const options = { ...property.option, isAutoGenerated: true };
+        const isPrimitiveType = ['object', 'string', 'number', 'bool', 'boolean'].includes(type);
+        const isAnyType = type === 'string' && options.format === 'any';
+        const isEnumType = (0, api_property_helper_1.isEnumProperty)(options);
         const isNestedType = !isPrimitiveType && !isEnumType;
         let propertyType = '';
         if (isNestedType) {
-            propertyType = `ReturnType<() =>  ${type} ${property.option.isArray ? '[]' : ''}>`;
+            propertyType = `ReturnType<() =>  ${type} ${options.isArray ? '[]' : ''}>`;
+        }
+        else if (isAnyType) {
+            propertyType = `any ${options.isArray ? '[]' : ''}`;
         }
         else {
-            propertyType = `${type} ${property.option.isArray ? '[]' : ''}`;
+            propertyType = `${type} ${options.isArray ? '[]' : ''}`;
         }
-        const propertyName = `${property.name}${property.option.required === false ? '?' : ''}: ${propertyType}`;
+        const propertyName = `${property.name}${options.required === false ? '?' : ''}: ${propertyType}`;
         let typeDecorator = '';
         if (isNestedType) {
             typeDecorator = `@Type(() => ${type})`;
         }
-        const options = { ...property.option, isAutoGenerated: true };
         let propertyOption = JSON.stringify(options);
-        if ((0, shared_utils_1.isFunction)(property.option.type)) {
+        if ((0, shared_utils_1.isFunction)(options.type)) {
             if (isNestedType) {
                 propertyOption = JSON.stringify({ ...options, type: type }).replaceAll(`"type":"${type}"`, `"type": () => ${type}`);
             }
@@ -63,7 +67,7 @@ class ServiceTemplateService extends hbs_generator_service_1.HbsGeneratorService
         let propertyDecorator = `
             @Property(${propertyOption})
         `;
-        if (type === 'any') {
+        if (isAnyType) {
             propertyDecorator += `
             @AnyType()
             `;

package/services/service-template.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service-template.service.js","sourceRoot":"","sources":["../../../lib/services/service-template.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service-template.service.js","sourceRoot":"","sources":["../../../lib/services/service-template.service.ts"],"names":[],"mappings":"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"}