react-obsidian 2.18.0 → 2.20.0

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.
Files changed (20) hide show
  1. package/dist/src/decorators/inject/Inject.d.ts +1 -1
  2. package/dist/src/decorators/inject/Inject.d.ts.map +1 -1
  3. package/dist/src/decorators/inject/Inject.js +2 -8
  4. package/dist/src/decorators/inject/Inject.js.map +1 -1
  5. package/dist/src/injectors/class/ClassInjector.d.ts.map +1 -1
  6. package/dist/src/injectors/class/ClassInjector.js +1 -10
  7. package/dist/src/injectors/class/ClassInjector.js.map +1 -1
  8. package/dist/src/injectors/class/InjectionMetadata.d.ts +0 -1
  9. package/dist/src/injectors/class/InjectionMetadata.d.ts.map +1 -1
  10. package/dist/src/injectors/class/InjectionMetadata.js +0 -5
  11. package/dist/src/injectors/class/InjectionMetadata.js.map +1 -1
  12. package/package.json +1 -1
  13. package/src/decorators/inject/Inject.ts +1 -6
  14. package/src/injectors/class/ClassInjector.ts +1 -10
  15. package/src/injectors/class/InjectionMetadata.ts +0 -10
  16. package/dist/src/utils/isNumber.d.ts +0 -2
  17. package/dist/src/utils/isNumber.d.ts.map +0 -1
  18. package/dist/src/utils/isNumber.js +0 -7
  19. package/dist/src/utils/isNumber.js.map +0 -1
  20. package/src/utils/isNumber.ts +0 -3
package/dist/src/decorators/inject/Inject.d.ts CHANGED
@@ -1,2 +1,2 @@
1
- export declare function inject(name?: string): (target: Object | any, _propertyKey?: string, indexOrPropertyDescriptor?: number | PropertyDescriptor) => void;
1
+ export declare function inject(name?: string): (target: Object | any, _propertyKey?: string, _indexOrPropertyDescriptor?: number | PropertyDescriptor) => void;
2
2
  //# sourceMappingURL=Inject.d.ts.map
package/dist/src/decorators/inject/Inject.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Inject.d.ts","sourceRoot":"","sources":["../../../../src/decorators/inject/Inject.ts"],"names":[],"mappings":"AAGA,wBAAgB,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,YAExB,MAAM,GAAG,GAAG,iBACL,MAAM,8BACO,MAAM,GAAG,kBAAkB,UAS1D"}
1
+ {"version":3,"file":"Inject.d.ts","sourceRoot":"","sources":["../../../../src/decorators/inject/Inject.ts"],"names":[],"mappings":"AAEA,wBAAgB,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,YAExB,MAAM,GAAG,GAAG,iBACL,MAAM,+BACQ,MAAM,GAAG,kBAAkB,UAK3D"}
package/dist/src/decorators/inject/Inject.js CHANGED
@@ -4,17 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.inject = inject;
7
- const isNumber_1 = require("../../utils/isNumber");
8
7
  const InjectionMetadata_1 = __importDefault(require("../../injectors/class/InjectionMetadata"));
9
8
  function inject(name) {
10
- return (target, _propertyKey, indexOrPropertyDescriptor) => {
9
+ return (target, _propertyKey, _indexOrPropertyDescriptor) => {
11
10
  const metadata = new InjectionMetadata_1.default();
12
- if ((0, isNumber_1.isNumber)(indexOrPropertyDescriptor)) {
13
- metadata.saveConstructorParamMetadata(target, name, indexOrPropertyDescriptor);
14
- }
15
- else {
16
- metadata.savePropertyMetadata(target.constructor, name);
17
- }
11
+ metadata.savePropertyMetadata(target.constructor, name);
18
12
  };
19
13
  }
20
14
  //# sourceMappingURL=Inject.js.map
package/dist/src/decorators/inject/Inject.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Inject.js","sourceRoot":"","sources":["../../../../src/decorators/inject/Inject.ts"],"names":[],"mappings":";;;;;AAGA,wBAaC;AAhBD,mDAAgD;AAChD,gGAAwE;AAExE,SAAgB,MAAM,CAAC,IAAa;IAClC,OAAO,CACL,MAAoB,EACpB,YAAqB,EACrB,yBAAuD,EACvD,EAAE;QACF,MAAM,QAAQ,GAAG,IAAI,2BAAiB,EAAE,CAAC;QACzC,IAAI,IAAA,mBAAQ,EAAC,yBAAyB,CAAC,EAAE,CAAC;YACxC,QAAQ,CAAC,4BAA4B,CAAC,MAAM,EAAE,IAAK,EAAE,yBAAyB,CAAC,CAAC;QAClF,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,oBAAoB,CAAC,MAAM,CAAC,WAAW,EAAE,IAAK,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"Inject.js","sourceRoot":"","sources":["../../../../src/decorators/inject/Inject.ts"],"names":[],"mappings":";;;;;AAEA,wBASC;AAXD,gGAAwE;AAExE,SAAgB,MAAM,CAAC,IAAa;IAClC,OAAO,CACL,MAAoB,EACpB,YAAqB,EACrB,0BAAwD,EACxD,EAAE;QACF,MAAM,QAAQ,GAAG,IAAI,2BAAiB,EAAE,CAAC;QACvC,QAAQ,CAAC,oBAAoB,CAAC,MAAM,CAAC,WAAW,EAAE,IAAK,CAAC,CAAC;IAC7D,CAAC,CAAC;AACJ,CAAC"}
package/dist/src/injectors/class/ClassInjector.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ClassInjector.d.ts","sourceRoot":"","sources":["../../../../src/injectors/class/ClassInjector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AAKpD,MAAM,CAAC,OAAO,OAAO,aAAa;IAE9B,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,iBAAiB;gBADjB,aAAa,EAAE,aAAa,EAC5B,iBAAiB,GAAE,iBAA2C;IAGxE,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,YAC9B,aAAa,CAAC,GAAG,CAAC;IAKpC,OAAO,CAAC,kBAAkB;CAyC3B"}
1
+ {"version":3,"file":"ClassInjector.d.ts","sourceRoot":"","sources":["../../../../src/injectors/class/ClassInjector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AAKpD,MAAM,CAAC,OAAO,OAAO,aAAa;IAE9B,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,iBAAiB;gBADjB,aAAa,EAAE,aAAa,EAC5B,iBAAiB,GAAE,iBAA2C;IAGxE,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,YAC9B,aAAa,CAAC,GAAG,CAAC;IAKpC,OAAO,CAAC,kBAAkB;CAgC3B"}
package/dist/src/injectors/class/ClassInjector.js CHANGED
@@ -28,9 +28,8 @@ class ClassInjector {
28
28
  ReferenceCounter_1.default.retain(graph);
29
29
  }
30
30
  reflect_1.Reflect.defineMetadata(LateInjector_1.GRAPH_INSTANCE_NAME_KEY, graph.name, target);
31
- const argsToInject = this.injectConstructorArgs(args, graph, target);
32
31
  graph.onBind(target);
33
- const createdObject = reflect_1.Reflect.construct(target, argsToInject, newTarget);
32
+ const createdObject = reflect_1.Reflect.construct(target, args, newTarget);
34
33
  this.injectProperties(target, createdObject, graph);
35
34
  const originalComponentWillUnmount = createdObject.componentWillUnmount;
36
35
  createdObject.componentWillUnmount = () => {
@@ -39,14 +38,6 @@ class ClassInjector {
39
38
  };
40
39
  return createdObject;
41
40
  }
42
- injectConstructorArgs(args, graph, target) {
43
- const argsToInject = injectionMetadata.getConstructorArgsToInject(target);
44
- if (!argsToInject.hasArgs())
45
- return args;
46
- return [...args, ...new Array(Math.abs(args.length - argsToInject.size()))].map((value, idx) => {
47
- return value !== null && value !== void 0 ? value : graph.retrieve(argsToInject.getProperty(idx));
48
- });
49
- }
50
41
  injectProperties(target, createdObject, graph) {
51
42
  injectionMetadata.getPropertiesToInject(target).forEach((key) => {
52
43
  reflect_1.Reflect.set(createdObject, key, graph.retrieve(key));
package/dist/src/injectors/class/ClassInjector.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ClassInjector.js","sourceRoot":"","sources":["../../../../src/injectors/class/ClassInjector.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ClassInjector.js","sourceRoot":"","sources":["../../../../src/injectors/class/ClassInjector.ts"],"names":[],"mappings":";;;;;AAGA,4EAAoD;AACpD,iDAAyD;AACzD,8EAAsD;AACtD,iDAA8C;AAE9C,MAAqB,aAAa;IAChC,YACU,aAA4B,EAC5B,oBAAuC,IAAI,2BAAiB,EAAE;QAD9D,kBAAa,GAAb,aAAa,CAAe;QAC5B,sBAAiB,GAAjB,iBAAiB,CAA6C;IACrE,CAAC;IAEJ,MAAM,CAAC,UAAyC;QAC9C,OAAO,CAAC,MAA0B,EAAE,EAAE;YACpC,OAAO,IAAI,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAC5G,CAAC,CAAC;IACJ,CAAC;IAEO,kBAAkB,CACxB,UAAyC,EACzC,aAA4B,EAC5B,iBAAoC;QAEpC,OAAO,IAAI,MAAM,OAAO;YACtB,SAAS,CAAC,MAAW,EAAE,IAAW,EAAE,SAAmB;;gBACrD,MAAM,qBAAqB,GAAG,MAAA,MAAM,CAAC,SAAS,0CAAE,gBAAgB,CAAC;gBACjE,MAAM,MAAM,GAAG,qBAAqB,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC;gBAC3E,MAAM,KAAK,GAAG,aAAa,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;gBAC/F,IAAI,qBAAqB,EAAE,CAAC;oBAC1B,0BAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACjC,CAAC;gBACD,iBAAO,CAAC,cAAc,CAAC,sCAAuB,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;gBACpE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBACrB,MAAM,aAAa,GAAG,iBAAO,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;gBACjE,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;gBACpD,MAAM,4BAA4B,GAAG,aAAa,CAAC,oBAAoB,CAAC;gBACxE,aAAa,CAAC,oBAAoB,GAAG,GAAG,EAAE;oBACxC,4BAA4B,aAA5B,4BAA4B,uBAA5B,4BAA4B,EAAI,CAAC;oBACjC,0BAAgB,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBACjE,CAAC,CAAC;gBACF,OAAO,aAAa,CAAC;YACvB,CAAC;YAEO,gBAAgB,CAAC,MAAW,EAAE,aAAkB,EAAE,KAAY;gBACpE,iBAAiB,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;oBAC9D,iBAAO,CAAC,GAAG,CAAC,aAAa,EAAE,GAAG,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;gBACvD,CAAC,CAAC,CAAC;YACL,CAAC;SACF,EAAE,CAAC;IACN,CAAC;CACF;AA5CD,gCA4CC"}
package/dist/src/injectors/class/InjectionMetadata.d.ts CHANGED
@@ -6,7 +6,6 @@ export default class InjectionMetadata {
6
6
  getConstructorArgsToInject(target: any): ConstructorArgs;
7
7
  getPropertiesToInject(target: any): Set<string>;
8
8
  getLatePropertiesToInject(target: any): Set<string>;
9
- saveConstructorParamMetadata(target: any, paramName: string, index: number): void;
10
9
  savePropertyMetadata(target: any, property: string): void;
11
10
  saveLatePropertyMetadata(target: any, property: string): void;
12
11
  private saveProperties;
package/dist/src/injectors/class/InjectionMetadata.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"InjectionMetadata.d.ts","sourceRoot":"","sources":["../../../../src/injectors/class/InjectionMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGpD,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAuB;IAC5D,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAgC;IAC3E,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAA8B;IAEvE,0BAA0B,CAAC,MAAM,EAAE,GAAG,GAAG,eAAe;IAIxD,qBAAqB,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC;IAI/C,yBAAyB,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC;IAInD,4BAA4B,CAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAU1E,oBAAoB,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM;IAQlD,wBAAwB,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM;IAQtD,OAAO,CAAC,cAAc;IAQtB,OAAO,CAAC,aAAa;CAGtB"}
1
+ {"version":3,"file":"InjectionMetadata.d.ts","sourceRoot":"","sources":["../../../../src/injectors/class/InjectionMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGpD,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAuB;IAC5D,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAgC;IAC3E,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAA8B;IAEvE,0BAA0B,CAAC,MAAM,EAAE,GAAG,GAAG,eAAe;IAIxD,qBAAqB,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC;IAI/C,yBAAyB,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC;IAInD,oBAAoB,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM;IAQlD,wBAAwB,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM;IAQtD,OAAO,CAAC,cAAc;IAQtB,OAAO,CAAC,aAAa;CAGtB"}
package/dist/src/injectors/class/InjectionMetadata.js CHANGED
@@ -18,11 +18,6 @@ class InjectionMetadata {
18
18
  getLatePropertiesToInject(target) {
19
19
  return this.getProperties(this.lateInjectionMetadataKey, target);
20
20
  }
21
- saveConstructorParamMetadata(target, paramName, index) {
22
- const argsToInject = this.getConstructorArgsToInject(target);
23
- argsToInject.add(paramName, index);
24
- reflect_1.Reflect.defineMetadata(this.injectedConstructorArgsKey, argsToInject, target);
25
- }
26
21
  savePropertyMetadata(target, property) {
27
22
  this.saveProperties(this.injectionMetadataKey, this.getPropertiesToInject(target).add(property), target);
28
23
  }
package/dist/src/injectors/class/InjectionMetadata.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"InjectionMetadata.js","sourceRoot":"","sources":["../../../../src/injectors/class/InjectionMetadata.ts"],"names":[],"mappings":";;AAAA,uDAAoD;AACpD,iDAA4C;AAE5C,MAAqB,iBAAiB;IAAtC;QACmB,yBAAoB,GAAG,mBAAmB,CAAC;QAC3C,+BAA0B,GAAG,4BAA4B,CAAC;QAC1D,6BAAwB,GAAG,0BAA0B,CAAC;IAmDzE,CAAC;IAjDC,0BAA0B,CAAC,MAAW;;QACpC,OAAO,MAAA,iBAAO,CAAC,WAAW,CAAC,IAAI,CAAC,0BAA0B,EAAE,MAAM,CAAC,mCAAI,IAAI,iCAAe,EAAE,CAAC;IAC/F,CAAC;IAED,qBAAqB,CAAC,MAAW;QAC/B,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;IAED,yBAAyB,CAAC,MAAW;QACnC,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,wBAAwB,EAAE,MAAM,CAAC,CAAC;IACnE,CAAC;IAED,4BAA4B,CAAC,MAAW,EAAE,SAAiB,EAAE,KAAa;QACxE,MAAM,YAAY,GAAG,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC;QAC7D,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QACnC,iBAAO,CAAC,cAAc,CACpB,IAAI,CAAC,0BAA0B,EAC/B,YAAY,EACZ,MAAM,CACP,CAAC;IACJ,CAAC;IAED,oBAAoB,CAAC,MAAW,EAAE,QAAgB;QAChD,IAAI,CAAC,cAAc,CACjB,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAChD,MAAM,CACP,CAAC;IACJ,CAAC;IAED,wBAAwB,CAAC,MAAW,EAAE,QAAgB;QACpD,IAAI,CAAC,cAAc,CACjB,IAAI,CAAC,wBAAwB,EAC7B,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EACpD,MAAM,CACP,CAAC;IACJ,CAAC;IAEO,cAAc,CAAC,GAAW,EAAE,UAAuB,EAAE,MAAW;QACtE,iBAAO,CAAC,cAAc,CACpB,GAAG,EACH,UAAU,EACV,MAAM,CACP,CAAC;IACJ,CAAC;IAEO,aAAa,CAAC,GAAW,EAAE,MAAW;;QAC5C,OAAO,MAAA,iBAAO,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,mCAAI,IAAI,GAAG,EAAE,CAAC;IACvD,CAAC;CACF;AAtDD,oCAsDC"}
1
+ {"version":3,"file":"InjectionMetadata.js","sourceRoot":"","sources":["../../../../src/injectors/class/InjectionMetadata.ts"],"names":[],"mappings":";;AAAA,uDAAoD;AACpD,iDAA4C;AAE5C,MAAqB,iBAAiB;IAAtC;QACmB,yBAAoB,GAAG,mBAAmB,CAAC;QAC3C,+BAA0B,GAAG,4BAA4B,CAAC;QAC1D,6BAAwB,GAAG,0BAA0B,CAAC;IAyCzE,CAAC;IAvCC,0BAA0B,CAAC,MAAW;;QACpC,OAAO,MAAA,iBAAO,CAAC,WAAW,CAAC,IAAI,CAAC,0BAA0B,EAAE,MAAM,CAAC,mCAAI,IAAI,iCAAe,EAAE,CAAC;IAC/F,CAAC;IAED,qBAAqB,CAAC,MAAW;QAC/B,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;IAED,yBAAyB,CAAC,MAAW;QACnC,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,wBAAwB,EAAE,MAAM,CAAC,CAAC;IACnE,CAAC;IAED,oBAAoB,CAAC,MAAW,EAAE,QAAgB;QAChD,IAAI,CAAC,cAAc,CACjB,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAChD,MAAM,CACP,CAAC;IACJ,CAAC;IAED,wBAAwB,CAAC,MAAW,EAAE,QAAgB;QACpD,IAAI,CAAC,cAAc,CACjB,IAAI,CAAC,wBAAwB,EAC7B,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EACpD,MAAM,CACP,CAAC;IACJ,CAAC;IAEO,cAAc,CAAC,GAAW,EAAE,UAAuB,EAAE,MAAW;QACtE,iBAAO,CAAC,cAAc,CACpB,GAAG,EACH,UAAU,EACV,MAAM,CACP,CAAC;IACJ,CAAC;IAEO,aAAa,CAAC,GAAW,EAAE,MAAW;;QAC5C,OAAO,MAAA,iBAAO,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,mCAAI,IAAI,GAAG,EAAE,CAAC;IACvD,CAAC;CACF;AA5CD,oCA4CC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-obsidian",
3
- "version": "2.18.0",
3
+ "version": "2.20.0",
4
4
  "description": "Dependency injection framework for React and React Native applications",
5
5
  "scripts": {
6
6
  "prepack": "npm run lint && tsc --project tsconfig.prod.json",
package/src/decorators/inject/Inject.ts CHANGED
@@ -1,17 +1,12 @@
1
- import { isNumber } from '../../utils/isNumber';
2
1
  import InjectionMetadata from '../../injectors/class/InjectionMetadata';
3
2
 
4
3
  export function inject(name?: string) {
5
4
  return (
6
5
  target: Object | any,
7
6
  _propertyKey?: string,
8
- indexOrPropertyDescriptor?: number | PropertyDescriptor,
7
+ _indexOrPropertyDescriptor?: number | PropertyDescriptor,
9
8
  ) => {
10
9
  const metadata = new InjectionMetadata();
11
- if (isNumber(indexOrPropertyDescriptor)) {
12
- metadata.saveConstructorParamMetadata(target, name!, indexOrPropertyDescriptor);
13
- } else {
14
10
  metadata.savePropertyMetadata(target.constructor, name!);
15
- }
16
11
  };
17
12
  }
package/src/injectors/class/ClassInjector.ts CHANGED
@@ -32,9 +32,8 @@ export default class ClassInjector {
32
32
  referenceCounter.retain(graph);
33
33
  }
34
34
  Reflect.defineMetadata(GRAPH_INSTANCE_NAME_KEY, graph.name, target);
35
- const argsToInject = this.injectConstructorArgs(args, graph, target);
36
35
  graph.onBind(target);
37
- const createdObject = Reflect.construct(target, argsToInject, newTarget);
36
+ const createdObject = Reflect.construct(target, args, newTarget);
38
37
  this.injectProperties(target, createdObject, graph);
39
38
  const originalComponentWillUnmount = createdObject.componentWillUnmount;
40
39
  createdObject.componentWillUnmount = () => {
@@ -44,14 +43,6 @@ export default class ClassInjector {
44
43
  return createdObject;
45
44
  }
46
45
 
47
- private injectConstructorArgs(args: any[], graph: Graph, target: any): any[] {
48
- const argsToInject = injectionMetadata.getConstructorArgsToInject(target);
49
- if (!argsToInject.hasArgs()) return args;
50
- return [...args, ...new Array(Math.abs(args.length - argsToInject.size()))].map((value, idx): any => {
51
- return value ?? graph.retrieve(argsToInject.getProperty(idx));
52
- });
53
- }
54
-
55
46
  private injectProperties(target: any, createdObject: any, graph: Graph) {
56
47
  injectionMetadata.getPropertiesToInject(target).forEach((key) => {
57
48
  Reflect.set(createdObject, key, graph.retrieve(key));
package/src/injectors/class/InjectionMetadata.ts CHANGED
@@ -18,16 +18,6 @@ export default class InjectionMetadata {
18
18
  return this.getProperties(this.lateInjectionMetadataKey, target);
19
19
  }
20
20
 
21
- saveConstructorParamMetadata(target: any, paramName: string, index: number) {
22
- const argsToInject = this.getConstructorArgsToInject(target);
23
- argsToInject.add(paramName, index);
24
- Reflect.defineMetadata(
25
- this.injectedConstructorArgsKey,
26
- argsToInject,
27
- target,
28
- );
29
- }
30
-
31
21
  savePropertyMetadata(target: any, property: string) {
32
22
  this.saveProperties(
33
23
  this.injectionMetadataKey,
package/dist/src/utils/isNumber.d.ts DELETED
@@ -1,2 +0,0 @@
1
- export declare function isNumber(value: unknown): value is number;
2
- //# sourceMappingURL=isNumber.d.ts.map
package/dist/src/utils/isNumber.d.ts.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"isNumber.d.ts","sourceRoot":"","sources":["../../../src/utils/isNumber.ts"],"names":[],"mappings":"AAAA,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAExD"}
package/dist/src/utils/isNumber.js DELETED
@@ -1,7 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.isNumber = isNumber;
4
- function isNumber(value) {
5
- return typeof value === 'number';
6
- }
7
- //# sourceMappingURL=isNumber.js.map
package/dist/src/utils/isNumber.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"isNumber.js","sourceRoot":"","sources":["../../../src/utils/isNumber.ts"],"names":[],"mappings":";;AAAA,4BAEC;AAFD,SAAgB,QAAQ,CAAC,KAAc;IACrC,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC;AACnC,CAAC"}
package/src/utils/isNumber.ts DELETED
@@ -1,3 +0,0 @@
1
- export function isNumber(value: unknown): value is number {
2
- return typeof value === 'number';
3
- }