@decaf-ts/core 0.7.48 → 0.7.49

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.
@@ -30,17 +30,27 @@ exports.update = update;
30
30
  const del = () => OperationGuard(db_decorators_1.OperationKeys.DELETE);
31
31
  exports.del = del;
32
32
  function service(key) {
33
- key =
34
- typeof key === "string"
35
- ? key
36
- : decoration_1.Metadata.Symbol(key).toString();
37
33
  return function service(target, prop, descriptor) {
38
- decoration_1.Metadata.set(index_1.PersistenceKeys.SERVICE, key, target);
34
+ if (!descriptor) {
35
+ // class
36
+ key = key || target;
37
+ }
38
+ else {
39
+ // property
40
+ key = key || decoration_1.Metadata.type(target.constructor, prop);
41
+ }
42
+ key =
43
+ typeof key === "string"
44
+ ? key
45
+ : decoration_1.Metadata.Symbol(decoration_1.Metadata.constr(key))
46
+ .toString()
47
+ .replaceAll(".", "-");
39
48
  const decs = [];
40
49
  if (descriptor && typeof descriptor.value === "number") {
41
50
  decs.push((0, injectable_decorators_1.inject)(key));
42
51
  }
43
52
  else if (!descriptor && !prop) {
53
+ decoration_1.Metadata.set(index_1.PersistenceKeys.SERVICE, key, target);
44
54
  decs.push((0, injectable_decorators_1.injectable)(key, {
45
55
  callback: (inst) => Object.defineProperty(inst, "name", {
46
56
  enumerable: true,
@@ -55,7 +65,7 @@ function service(key) {
55
65
  }
56
66
  else
57
67
  throw new Error("Invalid decorator usage. Should be impossible");
58
- decs.push((0, decoration_1.metadata)(index_1.PersistenceKeys.SERVICE, key));
68
+ // decs.push(metadata(PersistenceKeys.SERVICE, key));
59
69
  return (0, decoration_1.apply)(...decs)(target, prop, descriptor);
60
70
  };
61
71
  }
@@ -3,4 +3,4 @@ export declare const create: () => (target: any, _propertyKey: string | symbol,
3
3
  export declare const read: () => (target: any, _propertyKey: string | symbol, descriptor: PropertyDescriptor) => PropertyDescriptor;
4
4
  export declare const update: () => (target: any, _propertyKey: string | symbol, descriptor: PropertyDescriptor) => PropertyDescriptor;
5
5
  export declare const del: () => (target: any, _propertyKey: string | symbol, descriptor: PropertyDescriptor) => PropertyDescriptor;
6
- export declare function service(key: string | ModelConstructor<any>): (target: any, prop?: any, descriptor?: any) => void;
6
+ export declare function service(key?: string | ModelConstructor<any>): (target: any, prop?: any, descriptor?: any) => void;
@@ -1 +1 @@
1
- {"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../src/utils/decorators.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../src/utils/decorators.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@decaf-ts/core",
3
- "version": "0.7.48",
3
+ "version": "0.7.49",
4
4
  "description": "Core persistence module for the decaf framework",
5
5
  "type": "module",
6
6
  "exports": {