react-obsidian 2.10.2 → 2.11.0-alpha.1
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/src/GraphProperties.js +1 -3
- package/dist/src/GraphProperties.js.map +1 -1
- package/dist/src/ProvidedPropertiesStore.js +4 -9
- package/dist/src/ProvidedPropertiesStore.js.map +1 -1
- package/dist/src/ReferenceCounter.js +2 -5
- package/dist/src/ReferenceCounter.js.map +1 -1
- package/dist/src/decorators/Graph.js +1 -2
- package/dist/src/decorators/Graph.js.map +1 -1
- package/dist/src/decorators/LifecycleBound.js +2 -4
- package/dist/src/decorators/LifecycleBound.js.map +1 -1
- package/dist/src/decorators/Memoize.d.ts.map +1 -1
- package/dist/src/decorators/Memoize.js +1 -2
- package/dist/src/decorators/Memoize.js.map +1 -1
- package/dist/src/decorators/Singleton.d.ts.map +1 -1
- package/dist/src/decorators/Singleton.js +1 -2
- package/dist/src/decorators/Singleton.js.map +1 -1
- package/dist/src/decorators/inject/Inject.d.ts +1 -1
- package/dist/src/decorators/inject/Inject.d.ts.map +1 -1
- package/dist/src/decorators/inject/Inject.js +1 -2
- package/dist/src/decorators/inject/Inject.js.map +1 -1
- package/dist/src/decorators/inject/Injectable.js +1 -2
- package/dist/src/decorators/inject/Injectable.js.map +1 -1
- package/dist/src/decorators/inject/LateInject.js +1 -2
- package/dist/src/decorators/inject/LateInject.js.map +1 -1
- package/dist/src/decorators/provides/MemoizeDescriptor.d.ts.map +1 -1
- package/dist/src/decorators/provides/MemoizeDescriptor.js +1 -3
- package/dist/src/decorators/provides/MemoizeDescriptor.js.map +1 -1
- package/dist/src/decorators/provides/Provides.js +1 -2
- package/dist/src/decorators/provides/Provides.js.map +1 -1
- package/dist/src/graph/CircularDependenciesDetector.js +2 -1
- package/dist/src/graph/CircularDependenciesDetector.js.map +1 -1
- package/dist/src/graph/ObjectGraph.d.ts +1 -1
- package/dist/src/graph/ObjectGraph.d.ts.map +1 -1
- package/dist/src/graph/ObjectGraph.js +6 -6
- package/dist/src/graph/ObjectGraph.js.map +1 -1
- package/dist/src/graph/PropertyRetriever.d.ts +1 -1
- package/dist/src/graph/PropertyRetriever.d.ts.map +1 -1
- package/dist/src/graph/PropertyRetriever.js +3 -2
- package/dist/src/graph/PropertyRetriever.js.map +1 -1
- package/dist/src/graph/PropertyRetrieverDelegate.d.ts +1 -1
- package/dist/src/graph/PropertyRetrieverDelegate.d.ts.map +1 -1
- package/dist/src/graph/ProviderBinder.d.ts.map +1 -1
- package/dist/src/graph/ProviderBinder.js +2 -4
- package/dist/src/graph/ProviderBinder.js.map +1 -1
- package/dist/src/graph/ServiceLocatorFactory.d.ts.map +1 -1
- package/dist/src/graph/VisitedNodes.js +2 -4
- package/dist/src/graph/VisitedNodes.js.map +1 -1
- package/dist/src/graph/registry/GraphMiddlewareChain.js +1 -0
- package/dist/src/graph/registry/GraphMiddlewareChain.js.map +1 -1
- package/dist/src/graph/registry/GraphRegistry.d.ts.map +1 -1
- package/dist/src/graph/registry/GraphRegistry.js +19 -26
- package/dist/src/graph/registry/GraphRegistry.js.map +1 -1
- package/dist/src/graph/registry/Middleware.js +1 -0
- package/dist/src/graph/registry/Middleware.js.map +1 -1
- package/dist/src/graph/registry/ObtainLifecycleBoundGraphException.js.map +1 -1
- package/dist/src/injectors/class/ClassInjector.d.ts.map +1 -1
- package/dist/src/injectors/class/ClassInjector.js +6 -5
- package/dist/src/injectors/class/ClassInjector.js.map +1 -1
- package/dist/src/injectors/class/ConstructorArgs.js +1 -3
- package/dist/src/injectors/class/ConstructorArgs.js.map +1 -1
- package/dist/src/injectors/class/InjectionMetadata.js +5 -9
- package/dist/src/injectors/class/InjectionMetadata.js.map +1 -1
- package/dist/src/injectors/class/LateInjector.js +1 -1
- package/dist/src/injectors/class/LateInjector.js.map +1 -1
- package/dist/src/injectors/components/ComponentInjector.js.map +1 -1
- package/dist/src/injectors/components/InjectComponent.d.ts +1 -1
- package/dist/src/injectors/components/InjectComponent.d.ts.map +1 -1
- package/dist/src/injectors/components/InjectComponent.js.map +1 -1
- package/dist/src/injectors/components/PropsInjector.d.ts.map +1 -1
- package/dist/src/injectors/components/PropsInjector.js +1 -1
- package/dist/src/injectors/components/PropsInjector.js.map +1 -1
- package/dist/src/injectors/components/useGraph.d.ts +1 -1
- package/dist/src/injectors/components/useGraph.d.ts.map +1 -1
- package/dist/src/injectors/components/useGraph.js +1 -1
- package/dist/src/injectors/components/useGraph.js.map +1 -1
- package/dist/src/injectors/components/useInjectionToken.d.ts.map +1 -1
- package/dist/src/injectors/components/useInjectionToken.js +1 -1
- package/dist/src/injectors/components/useInjectionToken.js.map +1 -1
- package/dist/src/injectors/hooks/HookInjector.js +2 -1
- package/dist/src/injectors/hooks/HookInjector.js.map +1 -1
- package/dist/src/injectors/hooks/InjectHook.d.ts.map +1 -1
- package/dist/src/injectors/hooks/InjectHook.js +2 -3
- package/dist/src/injectors/hooks/InjectHook.js.map +1 -1
- package/dist/src/model/Model.js.map +1 -1
- package/dist/src/observable/Observable.d.ts.map +1 -1
- package/dist/src/observable/Observable.js +3 -2
- package/dist/src/observable/Observable.js.map +1 -1
- package/dist/src/observable/cold/ColdMediatorObservable.d.ts.map +1 -1
- package/dist/src/observable/cold/ColdMediatorObservable.js +3 -4
- package/dist/src/observable/cold/ColdMediatorObservable.js.map +1 -1
- package/dist/src/observable/cold/useColdObservers.js +1 -2
- package/dist/src/observable/cold/useColdObservers.js.map +1 -1
- package/dist/src/observable/mapObservablesToValues.js +1 -2
- package/dist/src/observable/mapObservablesToValues.js.map +1 -1
- package/dist/src/observable/mediator/MediatorObservable.js.map +1 -1
- package/dist/src/observable/useObserver.d.ts.map +1 -1
- package/dist/src/observable/useObserver.js +1 -3
- package/dist/src/observable/useObserver.js.map +1 -1
- package/dist/src/observable/useObservers.d.ts +2 -1
- package/dist/src/observable/useObservers.d.ts.map +1 -1
- package/dist/src/observable/useObservers.js +2 -3
- package/dist/src/observable/useObservers.js.map +1 -1
- package/dist/src/utils/React.d.ts.map +1 -1
- package/dist/src/utils/React.js +2 -3
- package/dist/src/utils/React.js.map +1 -1
- package/dist/src/utils/isDev.js +4 -8
- package/dist/src/utils/isDev.js.map +1 -1
- package/dist/src/utils/isNumber.js +1 -2
- package/dist/src/utils/isNumber.js.map +1 -1
- package/dist/src/utils/uniqueId.js +2 -3
- package/dist/src/utils/uniqueId.js.map +1 -1
- package/dist/test/fixtures/CircularDependencyFromSubgraph.d.ts +1 -1
- package/dist/test/fixtures/CircularDependencyFromSubgraph.d.ts.map +1 -1
- package/dist/test/fixtures/CircularDependencyFromSubgraph.js +2 -2
- package/dist/test/fixtures/CircularDependencyFromSubgraph.js.map +1 -1
- package/dist/test/fixtures/CircularDependencyGraph.d.ts.map +1 -1
- package/dist/test/fixtures/CircularDependencyGraph.js +3 -2
- package/dist/test/fixtures/CircularDependencyGraph.js.map +1 -1
- package/dist/test/fixtures/CircularDependencyGraph2.d.ts.map +1 -1
- package/dist/test/fixtures/CircularDependencyGraph2.js +3 -2
- package/dist/test/fixtures/CircularDependencyGraph2.js.map +1 -1
- package/dist/test/fixtures/GraphWithMultipleDependencies.js +2 -2
- package/dist/test/fixtures/GraphWithMultipleDependencies.js.map +1 -1
- package/dist/test/fixtures/GraphWithOnBind.d.ts +1 -1
- package/dist/test/fixtures/GraphWithOnBind.d.ts.map +1 -1
- package/dist/test/fixtures/GraphWithOnBind.js +3 -2
- package/dist/test/fixtures/GraphWithOnBind.js.map +1 -1
- package/dist/test/fixtures/LifecycleBoundGraph.js +6 -4
- package/dist/test/fixtures/LifecycleBoundGraph.js.map +1 -1
- package/dist/test/fixtures/LifecycleBoundWithLifecycleBoundSubgraph.d.ts.map +1 -1
- package/dist/test/fixtures/LifecycleBoundWithLifecycleBoundSubgraph.js +2 -2
- package/dist/test/fixtures/LifecycleBoundWithLifecycleBoundSubgraph.js.map +1 -1
- package/dist/test/fixtures/MainGraph.js.map +1 -1
- package/dist/test/fixtures/ScopedLifecycleBoundGraph.js +2 -2
- package/dist/test/fixtures/ScopedLifecycleBoundGraph.js.map +1 -1
- package/dist/test/fixtures/SingletonGraph.js +1 -4
- package/dist/test/fixtures/SingletonGraph.js.map +1 -1
- package/dist/test/fixtures/StringProvider.js +1 -0
- package/dist/test/fixtures/StringProvider.js.map +1 -1
- package/dist/test/fixtures/Subgraph.js.map +1 -1
- package/dist/test/fixtures/SubgraphWithCircularDependency.d.ts.map +1 -1
- package/dist/test/fixtures/SubgraphWithCircularDependency.js +3 -2
- package/dist/test/fixtures/SubgraphWithCircularDependency.js.map +1 -1
- package/dist/test/fixtures/ThrowingMainGraph.js.map +1 -1
- package/dist/test/fixtures/UniqueNumberGraph.d.ts.map +1 -1
- package/dist/test/fixtures/UniqueNumberGraph.js +3 -3
- package/dist/test/fixtures/UniqueNumberGraph.js.map +1 -1
- package/dist/testkit/index.d.ts.map +1 -1
- package/dist/testkit/index.js +0 -1
- package/dist/testkit/index.js.map +1 -1
- package/dist/testkit/mockGraphs.js +1 -2
- package/dist/testkit/mockGraphs.js.map +1 -1
- package/dist/testkit/mockModel.js +1 -2
- package/dist/testkit/mockModel.js.map +1 -1
- package/dist/transformers/babel-plugin-obsidian/helpers/index.d.ts +2 -2
- package/dist/transformers/babel-plugin-obsidian/helpers/index.d.ts.map +1 -1
- package/dist/transformers/babel-plugin-obsidian/helpers/index.js +13 -16
- package/dist/transformers/babel-plugin-obsidian/helpers/index.js.map +1 -1
- package/dist/transformers/babel-plugin-obsidian/index.d.ts.map +1 -1
- package/dist/transformers/babel-plugin-obsidian/index.js +1 -1
- package/dist/transformers/babel-plugin-obsidian/index.js.map +1 -1
- package/dist/transformers/babel-plugin-obsidian/unmagler/method.d.ts.map +1 -1
- package/dist/transformers/babel-plugin-obsidian/unmagler/method.js +1 -3
- package/dist/transformers/babel-plugin-obsidian/unmagler/method.js.map +1 -1
- package/dist/transformers/babel-plugin-obsidian/unmagler/property.js.map +1 -1
- package/eslint.config.mjs +140 -0
- package/package.json +27 -25
- package/src/decorators/Memoize.ts +0 -1
- package/src/decorators/inject/Inject.ts +1 -1
- package/src/decorators/provides/MemoizeDescriptor.ts +0 -1
- package/src/graph/ObjectGraph.ts +2 -4
- package/src/graph/PropertyRetriever.ts +4 -4
- package/src/graph/PropertyRetrieverDelegate.ts +1 -1
- package/src/graph/ProviderBinder.ts +1 -2
- package/src/graph/registry/GraphRegistry.ts +7 -7
- package/src/graph/registry/ObtainLifecycleBoundGraphException.ts +1 -1
- package/src/injectors/class/ClassInjector.ts +2 -2
- package/src/injectors/components/ComponentInjector.tsx +1 -1
- package/src/injectors/components/InjectComponent.ts +3 -3
- package/src/injectors/components/PropsInjector.ts +0 -1
- package/src/injectors/components/useGraph.ts +1 -2
- package/src/injectors/hooks/InjectHook.ts +0 -1
- package/src/observable/Observable.ts +2 -2
- package/src/observable/cold/ColdMediatorObservable.ts +0 -1
- package/src/observable/cold/useColdObservers.ts +1 -1
- package/src/observable/mediator/MediatorObservable.ts +1 -1
- package/src/observable/useObserver.ts +1 -2
- package/src/observable/useObservers.ts +4 -3
- package/src/utils/isDev.ts +1 -2
- package/testkit/index.ts +0 -1
- package/transformers/babel-plugin-obsidian/helpers/index.ts +8 -8
- package/transformers/babel-plugin-obsidian/index.ts +0 -1
- package/transformers/babel-plugin-obsidian/unmagler/method.ts +1 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../testkit/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,cAAM,OAAO;IACX;;OAEG;IACI,UAAU,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,GAAG,KAAK,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../testkit/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,cAAM,OAAO;IACX;;OAEG;IACI,UAAU,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,GAAG,KAAK,WAAW,CAAC,CAAC;CAI/G;AAED,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,CAAC;AAEtB,eAAO,MAAM,OAAO,SAAgB,CAAC"}
|
package/dist/testkit/index.js
CHANGED
|
@@ -8,7 +8,6 @@ class TestKit {
|
|
|
8
8
|
* @deprecated testKit.mockGraphs is deprecated, use mockGraphs instead
|
|
9
9
|
*/
|
|
10
10
|
mockGraphs(graphNameToGraph) {
|
|
11
|
-
// eslint-disable-next-line no-console
|
|
12
11
|
console.warn('testKit.mockGraphs is deprecated, use mockGraphs instead');
|
|
13
12
|
return (0, mockGraphs_1.mockGraphs)(graphNameToGraph);
|
|
14
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../testkit/index.ts"],"names":[],"mappings":";;;AAEA,6CAA0C;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../testkit/index.ts"],"names":[],"mappings":";;;AAEA,6CAA0C;AAajC,2FAbA,uBAAU,OAaA;AAXnB,MAAM,OAAO;IACX;;OAEG;IACI,UAAU,CAAC,gBAA4F;QAC5G,OAAO,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC;QACzE,OAAO,IAAA,uBAAU,EAAC,gBAAgB,CAAC,CAAC;IACtC,CAAC;CACF;AAED,yCAAwC;AAA/B,sGAAA,SAAS,OAAA;AAGL,QAAA,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC"}
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.mockGraphs =
|
|
6
|
+
exports.mockGraphs = mockGraphs;
|
|
7
7
|
const ObjectGraph_1 = require("../src/graph/ObjectGraph");
|
|
8
8
|
const GraphMiddleware_1 = require("../src/graph/registry/GraphMiddleware");
|
|
9
9
|
const GraphRegistry_1 = __importDefault(require("../src/graph/registry/GraphRegistry"));
|
|
@@ -20,7 +20,6 @@ function mockGraphs(graphNameToGraph) {
|
|
|
20
20
|
clearRegisteredGraphs(graphNameToGraph);
|
|
21
21
|
GraphRegistry_1.default.addGraphMiddleware(graphMiddleware);
|
|
22
22
|
}
|
|
23
|
-
exports.mockGraphs = mockGraphs;
|
|
24
23
|
function clearRegisteredGraphs(graphNameToGraph) {
|
|
25
24
|
for (const graphName of Object.keys(graphNameToGraph)) {
|
|
26
25
|
GraphRegistry_1.default.clearGraphAfterItWasMockedInTests(graphName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mockGraphs.js","sourceRoot":"","sources":["../../testkit/mockGraphs.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mockGraphs.js","sourceRoot":"","sources":["../../testkit/mockGraphs.ts"],"names":[],"mappings":";;;;;AAMA,gCAeC;AApBD,0DAAgE;AAChE,2EAAwE;AAExE,wFAAgE;AAEhE,SAAgB,UAAU,CACxB,gBAA4F;IAE5F,MAAM,eAAe,GAAG,IAAI,KAAM,SAAQ,iCAAe;QACvD,OAAO,CAAQ,YAA+B,EAAE,KAAiC,EAAE,KAAa;YAC9F,IAAI,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBACjC,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACtD,OAAO,IAAA,qBAAO,EAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAC3F,CAAC;YACD,OAAO,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC5C,CAAC;KACF,EAAE,CAAC;IAEJ,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;IACxC,uBAAa,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,qBAAqB,CAC5B,gBAA4F;IAE5F,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACtD,uBAAa,CAAC,iCAAiC,CAAC,SAAS,CAAC,CAAC;IAC7D,CAAC;AACH,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.mockModel =
|
|
3
|
+
exports.mockModel = mockModel;
|
|
4
4
|
const Model_1 = require("../src/model/Model");
|
|
5
5
|
function mockModel(mock, BaseClass) {
|
|
6
6
|
if (BaseClass) {
|
|
@@ -15,5 +15,4 @@ function mockModel(mock, BaseClass) {
|
|
|
15
15
|
}
|
|
16
16
|
}();
|
|
17
17
|
}
|
|
18
|
-
exports.mockModel = mockModel;
|
|
19
18
|
//# sourceMappingURL=mockModel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mockModel.js","sourceRoot":"","sources":["../../testkit/mockModel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mockModel.js","sourceRoot":"","sources":["../../testkit/mockModel.ts"],"names":[],"mappings":";;AAGA,8BAaC;AAfD,8CAA2C;AAE3C,SAAgB,SAAS,CAAwC,IAAO,EAAE,SAA4B;IACpG,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,EAAE,GAAG,IAAI,SAAS,EAAE,CAAC;QAC3B,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QACxB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,IAAI,KAAM,SAAQ,aAAK;QAC5B;YACE,KAAK,EAAE,CAAC;YACR,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC5B,CAAC;KACF,EAAO,CAAC;AACX,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ClassMethod, ClassProperty, Decorator, Identifier, ObjectExpression, ObjectPattern, TSParameterProperty } from '@babel/types';
|
|
1
|
+
import { ClassMethod, ClassProperty, Decorator, Identifier, ObjectExpression, ObjectPattern, TSParameterProperty, Node } from '@babel/types';
|
|
2
2
|
export type AcceptedNodeType = Identifier | TSParameterProperty | ClassProperty;
|
|
3
3
|
export declare function providerIsNotNamed(decorator: Decorator): boolean;
|
|
4
4
|
export declare function addNameToProviderArguments(node: ClassMethod, decorator: Decorator): void;
|
|
@@ -6,6 +6,6 @@ export declare function getDecoratorArgument(decorator: Decorator): ObjectExpres
|
|
|
6
6
|
export declare function getMethodName(node: ClassMethod): string;
|
|
7
7
|
export declare function getDecoratorByName(decorators: Array<Decorator> | undefined | null, decoratorName: string): Decorator | undefined;
|
|
8
8
|
export declare function getDecoratorName(decorator?: Decorator): string | undefined;
|
|
9
|
-
export declare function paramsToDestructuringAssignment(params:
|
|
9
|
+
export declare function paramsToDestructuringAssignment(params: Node[]): ObjectPattern;
|
|
10
10
|
export declare function passParamNameAsInjectArgument(node: AcceptedNodeType, decorator: Decorator): void;
|
|
11
11
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../transformers/babel-plugin-obsidian/helpers/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../transformers/babel-plugin-obsidian/helpers/index.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,WAAW,EACX,aAAa,EACb,SAAS,EACT,UAAU,EACV,gBAAgB,EAChB,aAAa,EACb,mBAAmB,EACnB,IAAI,EACL,MAAM,cAAc,CAAC;AAItB,MAAM,MAAM,gBAAgB,GAAG,UAAU,GAAG,mBAAmB,GAAG,aAAa,CAAC;AAEhF,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAWhE;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,QAOjF;AAED,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,SAAS,GAAG,gBAAgB,GAAG,SAAS,CAKvF;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,MAAM,CAGvD;AAED,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,SAAS,GAAG,IAAI,EAC/C,aAAa,EAAE,MAAM,GACpB,SAAS,GAAG,SAAS,CAEvB;AAED,wBAAgB,gBAAgB,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS,CAE1E;AAED,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,aAAa,CAI7E;AAED,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,gBAAgB,EACtB,SAAS,EAAE,SAAS,QAOrB"}
|
|
@@ -1,7 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
|
|
3
|
+
exports.providerIsNotNamed = providerIsNotNamed;
|
|
4
|
+
exports.addNameToProviderArguments = addNameToProviderArguments;
|
|
5
|
+
exports.getDecoratorArgument = getDecoratorArgument;
|
|
6
|
+
exports.getMethodName = getMethodName;
|
|
7
|
+
exports.getDecoratorByName = getDecoratorByName;
|
|
8
|
+
exports.getDecoratorName = getDecoratorName;
|
|
9
|
+
exports.paramsToDestructuringAssignment = paramsToDestructuringAssignment;
|
|
10
|
+
exports.passParamNameAsInjectArgument = passParamNameAsInjectArgument;
|
|
5
11
|
const core_1 = require("@babel/core");
|
|
6
12
|
const never = '';
|
|
7
13
|
function providerIsNotNamed(decorator) {
|
|
@@ -16,41 +22,33 @@ function providerIsNotNamed(decorator) {
|
|
|
16
22
|
}
|
|
17
23
|
return true;
|
|
18
24
|
}
|
|
19
|
-
exports.providerIsNotNamed = providerIsNotNamed;
|
|
20
25
|
function addNameToProviderArguments(node, decorator) {
|
|
21
|
-
|
|
22
|
-
const argument = (_a = getDecoratorArgument(decorator)) !== null && _a !== void 0 ? _a : core_1.types.objectExpression([]);
|
|
26
|
+
const argument = getDecoratorArgument(decorator) ?? core_1.types.objectExpression([]);
|
|
23
27
|
argument.properties.push(core_1.types.objectProperty(core_1.types.identifier('name'), core_1.types.stringLiteral(getMethodName(node))));
|
|
24
28
|
decorator.expression.arguments = [argument];
|
|
25
29
|
}
|
|
26
|
-
exports.addNameToProviderArguments = addNameToProviderArguments;
|
|
27
30
|
function getDecoratorArgument(decorator) {
|
|
28
31
|
if (core_1.types.isCallExpression(decorator.expression)) {
|
|
29
|
-
return decorator.expression.arguments.find(
|
|
32
|
+
return decorator.expression.arguments.find(a => core_1.types.isObjectExpression(a));
|
|
30
33
|
}
|
|
31
34
|
return undefined;
|
|
32
35
|
}
|
|
33
|
-
exports.getDecoratorArgument = getDecoratorArgument;
|
|
34
36
|
function getMethodName(node) {
|
|
35
37
|
if (core_1.types.isIdentifier(node.key))
|
|
36
38
|
return node.key.name;
|
|
37
39
|
throw new Error(`Tried to get class name but encountered unexpected key of type: ${node.key.type}`);
|
|
38
40
|
}
|
|
39
|
-
exports.getMethodName = getMethodName;
|
|
40
41
|
function getDecoratorByName(decorators, decoratorName) {
|
|
41
|
-
return decorators
|
|
42
|
+
return decorators?.find(decorator => get(decorator, 'expression.callee.name') === decoratorName);
|
|
42
43
|
}
|
|
43
|
-
exports.getDecoratorByName = getDecoratorByName;
|
|
44
44
|
function getDecoratorName(decorator) {
|
|
45
45
|
return get(decorator, 'expression.callee.name');
|
|
46
46
|
}
|
|
47
|
-
exports.getDecoratorName = getDecoratorName;
|
|
48
47
|
function paramsToDestructuringAssignment(params) {
|
|
49
48
|
return core_1.types.objectPattern(params
|
|
50
|
-
.filter(
|
|
51
|
-
.map(
|
|
49
|
+
.filter(p => core_1.types.isIdentifier(p))
|
|
50
|
+
.map(p => core_1.types.objectProperty(core_1.types.identifier(p.name), core_1.types.identifier(p.name))));
|
|
52
51
|
}
|
|
53
|
-
exports.paramsToDestructuringAssignment = paramsToDestructuringAssignment;
|
|
54
52
|
function passParamNameAsInjectArgument(node, decorator) {
|
|
55
53
|
if (core_1.types.isCallExpression(decorator.expression)) {
|
|
56
54
|
decorator.expression.arguments = [
|
|
@@ -58,7 +56,6 @@ function passParamNameAsInjectArgument(node, decorator) {
|
|
|
58
56
|
];
|
|
59
57
|
}
|
|
60
58
|
}
|
|
61
|
-
exports.passParamNameAsInjectArgument = passParamNameAsInjectArgument;
|
|
62
59
|
function getNodeName(node) {
|
|
63
60
|
if (core_1.types.isTSParameterProperty(node)) {
|
|
64
61
|
if (core_1.types.isIdentifier(node.parameter)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../transformers/babel-plugin-obsidian/helpers/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../transformers/babel-plugin-obsidian/helpers/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../transformers/babel-plugin-obsidian/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../transformers/babel-plugin-obsidian/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAY,SAAS,EAAE,MAAM,aAAa,CAAC;AAmClD,MAAM,CAAC,OAAO,UAAU,MAAM,gDAE7B"}
|
|
@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.default = plugin;
|
|
6
7
|
const unmagler_1 = __importDefault(require("./unmagler"));
|
|
7
8
|
const providerArgumentsTransformer = {
|
|
8
9
|
visitor: {
|
|
@@ -37,5 +38,4 @@ const internalVisitor = {
|
|
|
37
38
|
function plugin() {
|
|
38
39
|
return providerArgumentsTransformer;
|
|
39
40
|
}
|
|
40
|
-
exports.default = plugin;
|
|
41
41
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../transformers/babel-plugin-obsidian/index.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../transformers/babel-plugin-obsidian/index.ts"],"names":[],"mappings":";;;;;AA0CA,yBAEC;AApCD,0DAAkC;AAElC,MAAM,4BAA4B,GAAc;IAC9C,OAAO,EAAE;QACP,OAAO,CAAC,IAAuB;YAC7B,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;QACjC,CAAC;KACF;CACF,CAAC;AAEF,MAAM,eAAe,GAAG;IACtB,WAAW,EAAE;QACX,KAAK,CAAC,EAAE,IAAI,EAAyB;YACnC,kBAAQ,CAAC,eAAe,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAC7C,CAAC;KACF;IACD,aAAa,EAAE;QACb,KAAK,CAAC,EAAE,IAAI,EAA2B;YACrC,kBAAQ,CAAC,iBAAiB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YAC3C,kBAAQ,CAAC,iBAAiB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QACjD,CAAC;KACF;IACD,UAAU,EAAE;QACV,KAAK,CAAC,EAAE,IAAI,EAAwB;YAClC,kBAAQ,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC1C,CAAC;KACF;IACD,mBAAmB,EAAE;QACnB,KAAK,CAAC,EAAE,IAAI,EAAiC;YAC3C,kBAAQ,CAAC,uBAAuB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACnD,CAAC;KACF;CACF,CAAC;AAEF,SAAwB,MAAM;IAC5B,OAAO,4BAA4B,CAAC;AACtC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../transformers/babel-plugin-obsidian/unmagler/method.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAa,MAAM,cAAc,CAAC;AAStD,iBAAS,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,QAMlD;
|
|
1
|
+
{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../transformers/babel-plugin-obsidian/unmagler/method.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAa,MAAM,cAAc,CAAC;AAStD,iBAAS,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,QAMlD;AAcD,eAAe,UAAU,CAAC"}
|
|
@@ -9,11 +9,9 @@ function saveMethod(name, node) {
|
|
|
9
9
|
}
|
|
10
10
|
}
|
|
11
11
|
function convertProviderParamsToDestructuringAssignment(node) {
|
|
12
|
-
if (node.params.length === 0)
|
|
12
|
+
if (node.params.length === 0)
|
|
13
13
|
return;
|
|
14
|
-
}
|
|
15
14
|
const destructuredParams = (0, helpers_1.paramsToDestructuringAssignment)(node.params);
|
|
16
|
-
// eslint-disable-next-line no-param-reassign
|
|
17
15
|
node.params.length = 0;
|
|
18
16
|
node.params.push(destructuredParams);
|
|
19
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"method.js","sourceRoot":"","sources":["../../../../transformers/babel-plugin-obsidian/unmagler/method.ts"],"names":[],"mappings":";;AACA,wCAMoB;AAEpB,SAAS,UAAU,CAAC,IAAY,EAAE,IAAiB;IACjD,MAAM,SAAS,GAAG,IAAA,4BAAkB,EAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC5D,IAAI,IAAA,0BAAgB,EAAC,SAAS,CAAC,KAAK,IAAI,EAAE;
|
|
1
|
+
{"version":3,"file":"method.js","sourceRoot":"","sources":["../../../../transformers/babel-plugin-obsidian/unmagler/method.ts"],"names":[],"mappings":";;AACA,wCAMoB;AAEpB,SAAS,UAAU,CAAC,IAAY,EAAE,IAAiB;IACjD,MAAM,SAAS,GAAG,IAAA,4BAAkB,EAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC5D,IAAI,IAAA,0BAAgB,EAAC,SAAS,CAAC,KAAK,IAAI,EAAE,CAAC;QACzC,8CAA8C,CAAC,IAAI,CAAC,CAAC;QACrD,0CAA0C,CAAC,IAAI,EAAE,SAAU,CAAC,CAAC;IAC/D,CAAC;AACH,CAAC;AAED,SAAS,8CAA8C,CAAC,IAAiB;IACvE,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IACrC,MAAM,kBAAkB,GAAG,IAAA,yCAA+B,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACxE,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;IACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,0CAA0C,CAAC,IAAiB,EAAE,SAAoB;IACzF,IAAI,IAAA,4BAAkB,EAAC,SAAS,CAAC,EAAE,CAAC;QAClC,IAAA,oCAA0B,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC9C,CAAC;AACH,CAAC;AACD,kBAAe,UAAU,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"property.js","sourceRoot":"","sources":["../../../../transformers/babel-plugin-obsidian/unmagler/property.ts"],"names":[],"mappings":";;AACA,wCAMoB;AAEpB,SAAS,gBAAgB,CAAC,IAAY,EAAE,IAAsB;IAC5D,MAAM,SAAS,GAAG,IAAA,4BAAkB,EAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC5D,IAAI,IAAA,0BAAgB,EAAC,SAAS,CAAC,KAAK,IAAI,IAAI,gBAAgB,CAAC,SAAU,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"property.js","sourceRoot":"","sources":["../../../../transformers/babel-plugin-obsidian/unmagler/property.ts"],"names":[],"mappings":";;AACA,wCAMoB;AAEpB,SAAS,gBAAgB,CAAC,IAAY,EAAE,IAAsB;IAC5D,MAAM,SAAS,GAAG,IAAA,4BAAkB,EAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC5D,IAAI,IAAA,0BAAgB,EAAC,SAAS,CAAC,KAAK,IAAI,IAAI,gBAAgB,CAAC,SAAU,CAAC,EAAE,CAAC;QACzE,IAAA,uCAA6B,EAAC,IAAI,EAAE,SAAU,CAAC,CAAC;IAClD,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,SAAoB;IAC5C,OAAO,IAAA,8BAAoB,EAAC,SAAS,CAAC,KAAK,SAAS,CAAC;AACvD,CAAC;AAED,kBAAe,gBAAgB,CAAC"}
|
|
@@ -0,0 +1,140 @@
|
|
|
1
|
+
import stylistic from "@stylistic/eslint-plugin";
|
|
2
|
+
import eslintJest from "eslint-plugin-jest";
|
|
3
|
+
import obsidian from "eslint-plugin-obsidian";
|
|
4
|
+
import globals from "globals";
|
|
5
|
+
import tsParser from "@typescript-eslint/parser";
|
|
6
|
+
import eslintTs from "typescript-eslint";
|
|
7
|
+
import eslintJs from "@eslint/js";
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
export default eslintTs.config(
|
|
11
|
+
{
|
|
12
|
+
ignores: ["**/*.d.ts", "**/*.js"],
|
|
13
|
+
},
|
|
14
|
+
{
|
|
15
|
+
files: ["**/*.ts", "**/*.tsx"],
|
|
16
|
+
name: "ReactObsidian",
|
|
17
|
+
languageOptions: {
|
|
18
|
+
globals: {
|
|
19
|
+
...globals.jest,
|
|
20
|
+
},
|
|
21
|
+
sourceType: "module",
|
|
22
|
+
parser: tsParser,
|
|
23
|
+
parserOptions: {
|
|
24
|
+
project: "tsconfig.json",
|
|
25
|
+
tsconfigRootDir: import.meta.dirname,
|
|
26
|
+
},
|
|
27
|
+
},
|
|
28
|
+
settings: {
|
|
29
|
+
"import/resolver": {
|
|
30
|
+
node: {
|
|
31
|
+
extensions: [".js", ".jsx", ".ts", ".tsx"],
|
|
32
|
+
},
|
|
33
|
+
},
|
|
34
|
+
react: {
|
|
35
|
+
version: "detect",
|
|
36
|
+
},
|
|
37
|
+
},
|
|
38
|
+
extends: [
|
|
39
|
+
eslintJs.configs.recommended,
|
|
40
|
+
...eslintTs.configs.recommendedTypeChecked,
|
|
41
|
+
eslintJest.configs['flat/recommended'],
|
|
42
|
+
stylistic.configs["recommended-flat"],
|
|
43
|
+
],
|
|
44
|
+
plugins: {
|
|
45
|
+
obsidian,
|
|
46
|
+
},
|
|
47
|
+
rules: {
|
|
48
|
+
"@typescript-eslint/no-explicit-any": "off",
|
|
49
|
+
"@typescript-eslint/no-unsafe-member-access": "off",
|
|
50
|
+
"@typescript-eslint/no-empty-object-type": "off",
|
|
51
|
+
"@typescript-eslint/no-unsafe-assignment": "off",
|
|
52
|
+
"@typescript-eslint/no-unsafe-argument": "off",
|
|
53
|
+
"@typescript-eslint/no-unsafe-return": "off",
|
|
54
|
+
"@typescript-eslint/no-unsafe-function-type": "off",
|
|
55
|
+
"@typescript-eslint/no-unsafe-call": "off",
|
|
56
|
+
"@typescript-eslint/unbound-method": "off",
|
|
57
|
+
"@typescript-eslint/no-unused-vars": [
|
|
58
|
+
"error",
|
|
59
|
+
{
|
|
60
|
+
"args": "all",
|
|
61
|
+
"argsIgnorePattern": "^_",
|
|
62
|
+
"caughtErrors": "all",
|
|
63
|
+
"caughtErrorsIgnorePattern": "^_",
|
|
64
|
+
"destructuredArrayIgnorePattern": "^_",
|
|
65
|
+
"varsIgnorePattern": "^_",
|
|
66
|
+
"ignoreRestSiblings": true
|
|
67
|
+
}
|
|
68
|
+
],
|
|
69
|
+
"no-empty-function": ["error", {
|
|
70
|
+
allow: ["constructors"],
|
|
71
|
+
}],
|
|
72
|
+
"no-multiple-empty-lines": ["error", {
|
|
73
|
+
max: 1,
|
|
74
|
+
}],
|
|
75
|
+
"no-multi-spaces": "error",
|
|
76
|
+
"@stylistic/brace-style": ["error", "1tbs", { allowSingleLine: true }],
|
|
77
|
+
"@stylistic/jsx-one-expression-per-line": ["error", {
|
|
78
|
+
"allow": "non-jsx"
|
|
79
|
+
}],
|
|
80
|
+
"@stylistic/max-len": ["error", {
|
|
81
|
+
code: 115,
|
|
82
|
+
comments: 200,
|
|
83
|
+
ignoreRegExpLiterals: true,
|
|
84
|
+
ignoreStrings: true,
|
|
85
|
+
ignoreTemplateLiterals: true,
|
|
86
|
+
}],
|
|
87
|
+
"@stylistic/max-statements-per-line": ["error", { "max": 2 }],
|
|
88
|
+
"@stylistic/no-extra-semi": "error",
|
|
89
|
+
|
|
90
|
+
"@stylistic/lines-between-class-members": ["error", "always", {
|
|
91
|
+
exceptAfterSingleLine: true,
|
|
92
|
+
}],
|
|
93
|
+
"lines-between-class-members": ["error", {
|
|
94
|
+
enforce: [
|
|
95
|
+
{ blankLine: "always", prev: "method", next: "method" },
|
|
96
|
+
{ blankLine: "never", prev: "field", next: "field" },
|
|
97
|
+
]
|
|
98
|
+
}],
|
|
99
|
+
curly: ["error", "multi-line"],
|
|
100
|
+
"@stylistic/semi": ["error", "always"],
|
|
101
|
+
"@stylistic/comma-dangle": ["error", "always-multiline"],
|
|
102
|
+
"@stylistic/function-call-argument-newline": ["error", "consistent"],
|
|
103
|
+
"@stylistic/function-paren-newline": ["error", "multiline-arguments"],
|
|
104
|
+
|
|
105
|
+
"@stylistic/object-curly-newline": ["error", {
|
|
106
|
+
ObjectExpression: {
|
|
107
|
+
multiline: true,
|
|
108
|
+
consistent: true,
|
|
109
|
+
},
|
|
110
|
+
|
|
111
|
+
ObjectPattern: {
|
|
112
|
+
multiline: true,
|
|
113
|
+
consistent: true,
|
|
114
|
+
},
|
|
115
|
+
}],
|
|
116
|
+
|
|
117
|
+
"@stylistic/no-whitespace-before-property": "error",
|
|
118
|
+
"@stylistic/no-trailing-spaces": "error",
|
|
119
|
+
"@stylistic/member-delimiter-style": ["error", {
|
|
120
|
+
"multiline": {
|
|
121
|
+
"delimiter": "semi",
|
|
122
|
+
"requireLast": true
|
|
123
|
+
},
|
|
124
|
+
"singleline": {
|
|
125
|
+
"delimiter": "semi",
|
|
126
|
+
"requireLast": false
|
|
127
|
+
},
|
|
128
|
+
"multilineDetection": "brackets"
|
|
129
|
+
}],
|
|
130
|
+
"@stylistic/quotes": ["error", "single", {
|
|
131
|
+
avoidEscape: true,
|
|
132
|
+
allowTemplateLiterals: true,
|
|
133
|
+
}],
|
|
134
|
+
"@typescript-eslint/no-base-to-string": "off",
|
|
135
|
+
"obsidian/unresolved-provider-dependencies": "error",
|
|
136
|
+
"obsidian/no-circular-dependencies": "error",
|
|
137
|
+
"obsidian/strongly-typed-inject-component": "error",
|
|
138
|
+
},
|
|
139
|
+
}
|
|
140
|
+
);
|
package/package.json
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "react-obsidian",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.11.0-alpha.1",
|
|
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",
|
|
7
|
-
"lint": "
|
|
7
|
+
"lint": "eslint",
|
|
8
8
|
"build": "tsc --project tsconfig.json",
|
|
9
9
|
"pretest": "tsc --project tsconfig.json",
|
|
10
10
|
"test": "npx jest",
|
|
@@ -22,15 +22,18 @@
|
|
|
22
22
|
"react": "*"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
|
25
|
-
"@babel/core": "7.
|
|
26
|
-
"@babel/eslint-parser": "7.
|
|
27
|
-
"@babel/plugin-proposal-decorators": "7.
|
|
28
|
-
"@babel/plugin-transform-class-properties": "7.
|
|
29
|
-
"@babel/preset-env": "7.
|
|
30
|
-
"@babel/preset-react": "7.
|
|
31
|
-
"@babel/preset-typescript": "7.
|
|
32
|
-
"@babel/types": "7.
|
|
33
|
-
"@
|
|
25
|
+
"@babel/core": "^7.25.2",
|
|
26
|
+
"@babel/eslint-parser": "^7.25.1",
|
|
27
|
+
"@babel/plugin-proposal-decorators": "^7.24.7",
|
|
28
|
+
"@babel/plugin-transform-class-properties": "^7.25.4",
|
|
29
|
+
"@babel/preset-env": "^7.25.4",
|
|
30
|
+
"@babel/preset-react": "^7.24.7",
|
|
31
|
+
"@babel/preset-typescript": "^7.24.7",
|
|
32
|
+
"@babel/types": "^7.25.6",
|
|
33
|
+
"@eslint/compat": "^1.1.1",
|
|
34
|
+
"@eslint/eslintrc": "^3.1.0",
|
|
35
|
+
"@eslint/js": "^9.9.1",
|
|
36
|
+
"@stylistic/eslint-plugin": "^2.7.2",
|
|
34
37
|
"@testing-library/react": "14.x.x",
|
|
35
38
|
"@types/hoist-non-react-statics": "^3.3.1",
|
|
36
39
|
"@types/jest": "29.5.x",
|
|
@@ -38,21 +41,19 @@
|
|
|
38
41
|
"@types/lodash": "^4.14.176",
|
|
39
42
|
"@types/react": "18.3.x",
|
|
40
43
|
"@types/react-dom": "18.3.x",
|
|
41
|
-
"@typescript-eslint/eslint-plugin": "
|
|
42
|
-
"@typescript-eslint/parser": "
|
|
44
|
+
"@typescript-eslint/eslint-plugin": "^8.4.0",
|
|
45
|
+
"@typescript-eslint/parser": "^8.4.0",
|
|
43
46
|
"babel-plugin-parameter-decorator": "1.x.x",
|
|
44
47
|
"cross-env": "^7.0.3",
|
|
45
|
-
"eslint": "
|
|
46
|
-
"eslint-
|
|
47
|
-
"eslint-plugin-
|
|
48
|
-
"eslint-plugin-
|
|
49
|
-
"eslint-plugin-
|
|
50
|
-
"eslint-plugin-
|
|
51
|
-
"
|
|
52
|
-
"
|
|
53
|
-
"
|
|
54
|
-
"jest": "29.5.x",
|
|
55
|
-
"jest-environment-jsdom": "^29.5.0",
|
|
48
|
+
"eslint": "^9.9.1",
|
|
49
|
+
"eslint-plugin-jest": "^28.8.1",
|
|
50
|
+
"eslint-plugin-obsidian": "2.11.0-alpha.1",
|
|
51
|
+
"eslint-plugin-react": "^7.35.0",
|
|
52
|
+
"eslint-plugin-react-hooks": "^4.6.2",
|
|
53
|
+
"eslint-plugin-unused-imports": "^4.1.3",
|
|
54
|
+
"globals": "^15.9.0",
|
|
55
|
+
"jest": "29.7.x",
|
|
56
|
+
"jest-environment-jsdom": "^29.7.0",
|
|
56
57
|
"jest-extended": "^4.0.0",
|
|
57
58
|
"jest-mock-extended": "3.x.x",
|
|
58
59
|
"jest-when": "3.x.x",
|
|
@@ -60,7 +61,8 @@
|
|
|
60
61
|
"react": "18.2.x",
|
|
61
62
|
"react-dom": "18.2.x",
|
|
62
63
|
"setimmediate": "^1.0.5",
|
|
63
|
-
"typescript": "^
|
|
64
|
+
"typescript": "^5.5.4",
|
|
65
|
+
"typescript-eslint": "^8.3.0"
|
|
64
66
|
},
|
|
65
67
|
"repository": {
|
|
66
68
|
"type": "git",
|
package/src/graph/ObjectGraph.ts
CHANGED
|
@@ -26,13 +26,11 @@ export abstract class ObjectGraph<T = unknown> implements Graph {
|
|
|
26
26
|
return this.propertyRetriever.retrieve(property, receiver, detector) as Dependency | undefined;
|
|
27
27
|
}
|
|
28
28
|
|
|
29
|
-
onBind(_target: any) {
|
|
30
|
-
|
|
31
|
-
}
|
|
29
|
+
onBind(_target: any) { void 0; }
|
|
32
30
|
}
|
|
33
31
|
|
|
34
32
|
Reflect.set(ObjectGraph, 'typeDiscriminator', 'ObjectGraph');
|
|
35
33
|
|
|
36
|
-
export function isGraph(object:
|
|
34
|
+
export function isGraph(object: any): object is Constructable<ObjectGraph> {
|
|
37
35
|
return Reflect.get(object, 'typeDiscriminator') === 'ObjectGraph';
|
|
38
36
|
}
|
|
@@ -10,7 +10,7 @@ export default class PropertyRetriever {
|
|
|
10
10
|
property: string,
|
|
11
11
|
receiver?: unknown,
|
|
12
12
|
maybeDetector?: CircularDependenciesDetector,
|
|
13
|
-
): unknown
|
|
13
|
+
): unknown {
|
|
14
14
|
const mangledPropertyKey = providedPropertiesStore.getMangledProperty(this.graph, property);
|
|
15
15
|
const circularDependenciesDetector = maybeDetector ?? new CircularDependenciesDetector(this.graph.name);
|
|
16
16
|
|
|
@@ -32,8 +32,8 @@ export default class PropertyRetriever {
|
|
|
32
32
|
if (circularDependenciesDetector.hasCircularDependencies()) {
|
|
33
33
|
throw new Error(
|
|
34
34
|
`Could not resolve ${circularDependenciesDetector.firstDependencyName}`
|
|
35
|
-
|
|
36
|
-
|
|
35
|
+
+ ` from ${circularDependenciesDetector.graphName} because of a circular dependency:`
|
|
36
|
+
+ ` ${circularDependenciesDetector.getDependencies().join(' -> ')}`,
|
|
37
37
|
);
|
|
38
38
|
}
|
|
39
39
|
|
|
@@ -56,6 +56,6 @@ export default class PropertyRetriever {
|
|
|
56
56
|
const subgraphs = graphRegistry.getSubgraphs(this.graph);
|
|
57
57
|
return subgraphs
|
|
58
58
|
.map((subgraph: Graph) => subgraph.retrieve(property, receiver, circularDependenciesDetector))
|
|
59
|
-
.filter(
|
|
59
|
+
.filter(result => result !== undefined);
|
|
60
60
|
}
|
|
61
61
|
}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
/* eslint-disable no-param-reassign */
|
|
2
1
|
import providedPropertiesStore from '../ProvidedPropertiesStore';
|
|
3
2
|
import { Graph } from './Graph';
|
|
4
3
|
|
|
5
4
|
export function bindProviders(graph: Graph & Record<string, any>) {
|
|
6
5
|
providedPropertiesStore.getMangledProperties(graph)
|
|
7
|
-
.filter(
|
|
6
|
+
.filter(method => graph[method])
|
|
8
7
|
.forEach((method) => {
|
|
9
8
|
graph[method] = graph[method].bind(graph);
|
|
10
9
|
});
|
|
@@ -25,7 +25,7 @@ export class GraphRegistry {
|
|
|
25
25
|
getSubgraphs(graph: Graph): Graph[] {
|
|
26
26
|
const Graph = this.instanceToConstructor.get(graph)!;
|
|
27
27
|
const subgraphs = this.graphToSubgraphs.get(Graph) ?? new Set();
|
|
28
|
-
return Array.from(subgraphs).map(
|
|
28
|
+
return Array.from(subgraphs).map(G => this.resolve(G));
|
|
29
29
|
}
|
|
30
30
|
|
|
31
31
|
getGraphInstance(name: string): Graph {
|
|
@@ -39,9 +39,9 @@ export class GraphRegistry {
|
|
|
39
39
|
injectionToken?: string,
|
|
40
40
|
): T {
|
|
41
41
|
if ((this.isSingleton(Graph) || this.isBoundToReactLifecycle(Graph)) && this.has(Graph, injectionToken)) {
|
|
42
|
-
return this.isComponentScopedLifecycleBound(Graph)
|
|
43
|
-
this.getByInjectionToken(Graph, injectionToken)
|
|
44
|
-
this.getFirst(Graph);
|
|
42
|
+
return this.isComponentScopedLifecycleBound(Graph)
|
|
43
|
+
? this.getByInjectionToken(Graph, injectionToken)
|
|
44
|
+
: this.getFirst(Graph);
|
|
45
45
|
}
|
|
46
46
|
if (this.isBoundToReactLifecycle(Graph) && source !== 'lifecycleOwner') {
|
|
47
47
|
throw new ObtainLifecycleBoundGraphException(Graph);
|
|
@@ -58,7 +58,7 @@ export class GraphRegistry {
|
|
|
58
58
|
if (this.isComponentScopedLifecycleBound(Graph)) {
|
|
59
59
|
return Array
|
|
60
60
|
.from(instances)
|
|
61
|
-
.some(
|
|
61
|
+
.some(graph => this.instanceToInjectionToken.get(graph) === injectionToken);
|
|
62
62
|
}
|
|
63
63
|
|
|
64
64
|
return (this.constructorToInstance.get(Graph)?.size ?? 0) > 0;
|
|
@@ -151,7 +151,7 @@ export class GraphRegistry {
|
|
|
151
151
|
}
|
|
152
152
|
}
|
|
153
153
|
|
|
154
|
-
// @ts-
|
|
154
|
+
// @ts-expect-error - workaround an issue in jest tests where the registry was created multiple times
|
|
155
155
|
global.graphRegistry = global.graphRegistry || new GraphRegistry();
|
|
156
|
-
// @ts-
|
|
156
|
+
// @ts-expect-error - see above
|
|
157
157
|
export default global.graphRegistry as GraphRegistry;
|
|
@@ -10,6 +10,6 @@ export class ObtainLifecycleBoundGraphException extends Error {
|
|
|
10
10
|
private static createMessage(graph: Constructable<Graph>): string {
|
|
11
11
|
const graphName = isDev() ? ` ${graph.name}` : '';
|
|
12
12
|
return `Tried to obtain a @LifecycleBound graph${graphName}, but it was not created yet. `
|
|
13
|
-
|
|
13
|
+
+ '@LifecycleBound graphs can only be obtained after they were created by a React component or hook.';
|
|
14
14
|
}
|
|
15
15
|
}
|
|
@@ -35,10 +35,10 @@ export default class ClassInjector {
|
|
|
35
35
|
graph.onBind(target);
|
|
36
36
|
const createdObject = Reflect.construct(target, argsToInject, newTarget);
|
|
37
37
|
this.injectProperties(target, createdObject, graph);
|
|
38
|
-
const originalComponentWillUnmount = createdObject.componentWillUnmount;
|
|
38
|
+
const originalComponentWillUnmount: () => void | undefined = createdObject.componentWillUnmount;
|
|
39
39
|
createdObject.componentWillUnmount = () => {
|
|
40
40
|
originalComponentWillUnmount?.();
|
|
41
|
-
referenceCounter.release(graph,
|
|
41
|
+
referenceCounter.release(graph, g => graphRegistry.clear(g));
|
|
42
42
|
};
|
|
43
43
|
return createdObject;
|
|
44
44
|
}
|