@zdavison/nestjs-rpc-toolkit 0.0.6 → 0.0.8

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.
package/dist/bin/init.js CHANGED
@@ -112,7 +112,7 @@ class RpcPackageInitializer {
112
112
  "generate:types": "ts-node scripts/generate-all-rpc-types.ts"
113
113
  },
114
114
  dependencies: {
115
- "@zdavison/nestjs-rpc-toolkit": "^0.0.5",
115
+ "@zdavison/nestjs-rpc-toolkit": "^0.0.8",
116
116
  "@nestjs/common": "^10.0.0",
117
117
  "@nestjs/microservices": "^10.0.0"
118
118
  },
@@ -1 +1 @@
1
- {"version":3,"file":"rpc-method.decorator.d.ts","sourceRoot":"","sources":["../../src/decorators/rpc-method.decorator.ts"],"names":[],"mappings":"AAGA,wBAAgB,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,IACvB,QAAQ,GAAG,EAAE,aAAa,MAAM,EAAE,YAAY,kBAAkB,UAwElF"}
1
+ {"version":3,"file":"rpc-method.decorator.d.ts","sourceRoot":"","sources":["../../src/decorators/rpc-method.decorator.ts"],"names":[],"mappings":"AAGA,wBAAgB,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,IACvB,QAAQ,GAAG,EAAE,aAAa,MAAM,EAAE,YAAY,kBAAkB,UA2ClF"}
@@ -7,12 +7,6 @@ function RpcMethod(pattern) {
7
7
  return function (target, propertyKey, descriptor) {
8
8
  const originalMethod = descriptor.value;
9
9
  const actualPattern = pattern || propertyKey;
10
- const methodString = originalMethod.toString();
11
- const paramNames = methodString
12
- .slice(methodString.indexOf('(') + 1, methodString.indexOf(')'))
13
- .split(',')
14
- .map((param) => param.trim().split(/\s+/)[0])
15
- .filter((param) => param && param !== '');
16
10
  let module;
17
11
  let methodName;
18
12
  if (actualPattern.includes('.')) {
@@ -28,27 +22,15 @@ function RpcMethod(pattern) {
28
22
  pattern: actualPattern,
29
23
  module,
30
24
  methodName,
31
- paramNames,
32
25
  target: target.constructor,
33
26
  propertyKey,
34
27
  };
35
28
  rpc_registry_1.rpcRegistry.registerMethod(metadata);
36
- descriptor.value = function (data) {
37
- const isRpcCall = data && typeof data === 'object' &&
38
- paramNames.length > 0 &&
39
- paramNames.some((paramName) => paramName in data);
40
- if (!isRpcCall) {
41
- return originalMethod.call(this, data);
29
+ descriptor.value = function (args) {
30
+ if (Array.isArray(args)) {
31
+ return originalMethod.apply(this, args);
42
32
  }
43
- if (paramNames.length === 0 || !data || typeof data !== 'object') {
44
- return originalMethod.call(this, data);
45
- }
46
- if (paramNames.length === 1) {
47
- const paramName = paramNames[0];
48
- return originalMethod.call(this, data[paramName]);
49
- }
50
- const args = paramNames.map((paramName) => data[paramName]);
51
- return originalMethod.apply(this, args);
33
+ return originalMethod.call(this, args);
52
34
  };
53
35
  (0, microservices_1.MessagePattern)(actualPattern)(target, propertyKey, descriptor);
54
36
  };
@@ -1 +1 @@
1
- {"version":3,"file":"rpc-method.decorator.js","sourceRoot":"","sources":["../../src/decorators/rpc-method.decorator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rpc-method.decorator.js","sourceRoot":"","sources":["../../src/decorators/rpc-method.decorator.ts"],"names":[],"mappings":";;AAGA,8BA4CC;AA/CD,yDAA6E;AAC7E,sDAAqE;AAErE,SAAgB,SAAS,CAAC,OAAgB;IACxC,OAAO,UAAU,MAAW,EAAE,WAAmB,EAAE,UAA8B;QAC/E,MAAM,cAAc,GAAG,UAAU,CAAC,KAAK,CAAC;QAGxC,MAAM,aAAa,GAAG,OAAO,IAAI,WAAW,CAAC;QAI7C,IAAI,MAAc,CAAC;QACnB,IAAI,UAAkB,CAAC;QAEvB,IAAI,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAChC,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YACrC,UAAU,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,CAAC;aAAM,CAAC;YAEN,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC;YAC1C,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;YACzD,UAAU,GAAG,aAAa,CAAC;QAC7B,CAAC;QAGD,MAAM,QAAQ,GAAsB;YAClC,OAAO,EAAE,aAAa;YACtB,MAAM;YACN,UAAU;YACV,MAAM,EAAE,MAAM,CAAC,WAAW;YAC1B,WAAW;SACZ,CAAC;QACF,0BAAW,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAGrC,UAAU,CAAC,KAAK,GAAG,UAAU,IAAW;YAEtC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxB,OAAO,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAC1C,CAAC;YACD,OAAO,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACzC,CAAC,CAAC;QAGF,IAAA,8BAAkB,EAAC,aAAa,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;IACrE,CAAC,CAAC;AACJ,CAAC"}
@@ -2,7 +2,6 @@ export interface RpcMethodMetadata {
2
2
  pattern: string;
3
3
  module: string;
4
4
  methodName: string;
5
- paramNames: string[];
6
5
  returnType?: string;
7
6
  target: any;
8
7
  propertyKey: string;
@@ -1 +1 @@
1
- {"version":3,"file":"rpc-registry.d.ts","sourceRoot":"","sources":["../../src/rpc/rpc-registry.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,GAAG,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,cAAM,WAAW;IACf,OAAO,CAAC,OAAO,CAAwC;IACvD,OAAO,CAAC,cAAc,CAA0C;IAEhE,cAAc,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI;IASjD,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;IAIzD,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB,EAAE;IAIrD,aAAa,IAAI,iBAAiB,EAAE;IAIpC,kBAAkB,IAAI,GAAG,CAAC,MAAM,EAAE,iBAAiB,EAAE,CAAC;CAGvD;AAED,eAAO,MAAM,WAAW,aAAoB,CAAC"}
1
+ {"version":3,"file":"rpc-registry.d.ts","sourceRoot":"","sources":["../../src/rpc/rpc-registry.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,GAAG,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,cAAM,WAAW;IACf,OAAO,CAAC,OAAO,CAAwC;IACvD,OAAO,CAAC,cAAc,CAA0C;IAEhE,cAAc,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI;IASjD,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;IAIzD,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB,EAAE;IAIrD,aAAa,IAAI,iBAAiB,EAAE;IAIpC,kBAAkB,IAAI,GAAG,CAAC,MAAM,EAAE,iBAAiB,EAAE,CAAC;CAGvD;AAED,eAAO,MAAM,WAAW,aAAoB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"rpc-registry.js","sourceRoot":"","sources":["../../src/rpc/rpc-registry.ts"],"names":[],"mappings":";;;AAUA,MAAM,WAAW;IAAjB;QACU,YAAO,GAAG,IAAI,GAAG,EAA6B,CAAC;QAC/C,mBAAc,GAAG,IAAI,GAAG,EAA+B,CAAC;IA0BlE,CAAC;IAxBC,cAAc,CAAC,QAA2B;QACxC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAE7C,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9C,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC/C,CAAC;QACD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC3D,CAAC;IAED,SAAS,CAAC,OAAe;QACvB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;IAED,gBAAgB,CAAC,MAAc;QAC7B,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAC/C,CAAC;IAED,aAAa;QACX,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACtC,CAAC;CACF;AAEY,QAAA,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC"}
1
+ {"version":3,"file":"rpc-registry.js","sourceRoot":"","sources":["../../src/rpc/rpc-registry.ts"],"names":[],"mappings":";;;AASA,MAAM,WAAW;IAAjB;QACU,YAAO,GAAG,IAAI,GAAG,EAA6B,CAAC;QAC/C,mBAAc,GAAG,IAAI,GAAG,EAA+B,CAAC;IA0BlE,CAAC;IAxBC,cAAc,CAAC,QAA2B;QACxC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAE7C,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9C,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC/C,CAAC;QACD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC3D,CAAC;IAED,SAAS,CAAC,OAAe;QACvB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;IAED,gBAAgB,CAAC,MAAc;QAC7B,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAC/C,CAAC;IAED,aAAa;QACX,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACtC,CAAC;CACF;AAEY,QAAA,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC"}