react-obsidian 2.21.0 → 2.23.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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PropertyRetriever.d.ts","sourceRoot":"","sources":["../../../src/graph/PropertyRetriever.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAG9E,MAAM,CAAC,OAAO,OAAO,iBAAiB;
|
|
1
|
+
{"version":3,"file":"PropertyRetriever.d.ts","sourceRoot":"","sources":["../../../src/graph/PropertyRetriever.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAG9E,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACvB,OAAO,CAAC,KAAK;gBAAL,KAAK,EAAE,KAAK;IAEjC,QAAQ,CACN,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,OAAO,EAClB,aAAa,CAAC,EAAE,4BAA4B,GAC3C,OAAO,GAAG,SAAS;IA8BtB,OAAO,CAAC,gBAAgB;CAWzB"}
|
|
@@ -31,20 +31,15 @@ class PropertyRetriever {
|
|
|
31
31
|
+ ` from ${circularDependenciesDetector.graphName} because of a circular dependency:`
|
|
32
32
|
+ ` ${circularDependenciesDetector.getDependencies().join(' -> ')}`);
|
|
33
33
|
}
|
|
34
|
-
|
|
35
|
-
if (results.length === 1)
|
|
36
|
-
return results[0];
|
|
37
|
-
if (results.length > 1) {
|
|
38
|
-
throw new Error(`Multiple subgraphs provide the property ${property}.`
|
|
39
|
-
+ 'You should probably provide a unique name to one of the providers: @Provide({name: \'uniqueName\')})');
|
|
40
|
-
}
|
|
41
|
-
return undefined;
|
|
34
|
+
return this.getFromSubgraphs(property, circularDependenciesDetector, receiver);
|
|
42
35
|
}
|
|
43
36
|
getFromSubgraphs(property, circularDependenciesDetector, receiver) {
|
|
44
|
-
const
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
37
|
+
for (const subgraph of GraphRegistry_1.default.getSubgraphs(this.graph)) {
|
|
38
|
+
const result = subgraph.retrieve(property, receiver, circularDependenciesDetector);
|
|
39
|
+
if (result)
|
|
40
|
+
return result;
|
|
41
|
+
}
|
|
42
|
+
return undefined;
|
|
48
43
|
}
|
|
49
44
|
}
|
|
50
45
|
exports.default = PropertyRetriever;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PropertyRetriever.js","sourceRoot":"","sources":["../../../src/graph/PropertyRetriever.ts"],"names":[],"mappings":";;;;;AAAA,6EAAqD;AAErD,yFAAiE;AACjE,iFAA8E;AAC9E,
|
|
1
|
+
{"version":3,"file":"PropertyRetriever.js","sourceRoot":"","sources":["../../../src/graph/PropertyRetriever.ts"],"names":[],"mappings":";;;;;AAAA,6EAAqD;AAErD,yFAAiE;AACjE,iFAA8E;AAC9E,8CAA2C;AAE3C,MAAqB,iBAAiB;IACpC,YAAqB,KAAY;QAAZ,UAAK,GAAL,KAAK,CAAO;IAAI,CAAC;IAEtC,QAAQ,CACN,QAAgB,EAChB,QAAkB,EAClB,aAA4C;QAE5C,MAAM,kBAAkB,GAAG,iCAAuB,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC5F,MAAM,4BAA4B,GAAG,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,IAAI,2DAA4B,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAExG,IACE,kBAAkB;eACf,kBAAkB,IAAI,IAAI,CAAC,KAAK;eAChC,4BAA4B,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,EAChE,CAAC;YACD,MAAM,YAAY,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE;gBACzC,GAAG,CAAC,KAAY,EAAE,cAAsB;oBACtC,OAAO,KAAK,CAAC,QAAQ,CAAC,cAAc,EAAE,QAAQ,EAAE,4BAA4B,CAAC,CAAC;gBAChF,CAAC;aACF,CAAC,CAAC;YACH,MAAM,QAAQ,GAAG,iBAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,kBAAkB,EAAE,QAAQ,CAAC,CAAC,YAAY,CAAC,CAAC;YACrF,4BAA4B,CAAC,KAAK,EAAE,CAAC;YACrC,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,IAAI,4BAA4B,CAAC,uBAAuB,EAAE,EAAE,CAAC;YAC3D,MAAM,IAAI,KAAK,CACb,qBAAqB,4BAA4B,CAAC,mBAAmB,EAAE;kBACrE,SAAS,4BAA4B,CAAC,SAAS,oCAAoC;kBACnF,IAAI,4BAA4B,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CACpE,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,4BAA4B,EAAE,QAAQ,CAAC,CAAC;IACjF,CAAC;IAEO,gBAAgB,CACtB,QAAgB,EAChB,4BAA0D,EAC1D,QAAiB;QAEjB,KAAK,MAAM,QAAQ,IAAI,uBAAa,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9D,MAAM,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,4BAA4B,CAAC,CAAC;YACnF,IAAI,MAAM;gBAAE,OAAO,MAAM,CAAC;QAC5B,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAhDD,oCAgDC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "react-obsidian",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.23.0",
|
|
4
4
|
"description": "Dependency injection framework for React and React Native applications",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"prepack": "yarn lint && tsc --project tsconfig.prod.json",
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
"cross-env": "^7.0.3",
|
|
48
48
|
"eslint": "8.x.x",
|
|
49
49
|
"eslint-config-airbnb-typescript": "17.x.x",
|
|
50
|
-
"eslint-plugin-import": "^2.
|
|
50
|
+
"eslint-plugin-import": "^2.31.0",
|
|
51
51
|
"eslint-plugin-import-newlines": "^1.1.5",
|
|
52
52
|
"eslint-plugin-jest-formatting": "^3.1.0",
|
|
53
53
|
"eslint-plugin-obsidian": "workspace:*",
|
|
@@ -2,10 +2,10 @@ import graphRegistry from './registry/GraphRegistry';
|
|
|
2
2
|
import { Graph } from './Graph';
|
|
3
3
|
import providedPropertiesStore from '../ProvidedPropertiesStore';
|
|
4
4
|
import { CircularDependenciesDetector } from './CircularDependenciesDetector';
|
|
5
|
-
import {Reflect} from '../utils/reflect';
|
|
5
|
+
import { Reflect } from '../utils/reflect';
|
|
6
6
|
|
|
7
7
|
export default class PropertyRetriever {
|
|
8
|
-
constructor(private graph: Graph) { }
|
|
8
|
+
constructor (private graph: Graph) { }
|
|
9
9
|
|
|
10
10
|
retrieve(
|
|
11
11
|
property: string,
|
|
@@ -33,30 +33,23 @@ export default class PropertyRetriever {
|
|
|
33
33
|
if (circularDependenciesDetector.hasCircularDependencies()) {
|
|
34
34
|
throw new Error(
|
|
35
35
|
`Could not resolve ${circularDependenciesDetector.firstDependencyName}`
|
|
36
|
-
|
|
37
|
-
|
|
36
|
+
+ ` from ${circularDependenciesDetector.graphName} because of a circular dependency:`
|
|
37
|
+
+ ` ${circularDependenciesDetector.getDependencies().join(' -> ')}`,
|
|
38
38
|
);
|
|
39
39
|
}
|
|
40
40
|
|
|
41
|
-
|
|
42
|
-
if (results.length === 1) return results[0];
|
|
43
|
-
if (results.length > 1) {
|
|
44
|
-
throw new Error(
|
|
45
|
-
`Multiple subgraphs provide the property ${property}.`
|
|
46
|
-
+ 'You should probably provide a unique name to one of the providers: @Provide({name: \'uniqueName\')})',
|
|
47
|
-
);
|
|
48
|
-
}
|
|
49
|
-
return undefined;
|
|
41
|
+
return this.getFromSubgraphs(property, circularDependenciesDetector, receiver);
|
|
50
42
|
}
|
|
51
43
|
|
|
52
44
|
private getFromSubgraphs(
|
|
53
45
|
property: string,
|
|
54
46
|
circularDependenciesDetector: CircularDependenciesDetector,
|
|
55
47
|
receiver: unknown,
|
|
56
|
-
): unknown
|
|
57
|
-
const
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
48
|
+
): unknown | undefined {
|
|
49
|
+
for (const subgraph of graphRegistry.getSubgraphs(this.graph)) {
|
|
50
|
+
const result = subgraph.retrieve(property, receiver, circularDependenciesDetector);
|
|
51
|
+
if (result) return result;
|
|
52
|
+
}
|
|
53
|
+
return undefined;
|
|
61
54
|
}
|
|
62
55
|
}
|