@servicetitan/react-ioc 22.21.0 → 23.1.0

package/dist/await.d.ts

@@ -1,7 +1,7 @@
-import { FC, ReactNode } from 'react';
-export interface AwaitProps {
+import { FC, PropsWithChildren, ReactNode } from 'react';
+export declare type AwaitProps = PropsWithChildren<{
     promises: Promise<void>[];
     fallback?: NonNullable<ReactNode> | null;
-}
+}>;
 export declare const Await: FC<AwaitProps>;
 //# sourceMappingURL=await.d.ts.map

package/dist/await.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"await.d.ts","sourceRoot":"","sources":["../src/await.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAsB,SAAS,EAAqB,MAAM,OAAO,CAAC;AAE7E,MAAM,WAAW,UAAU;IACvB,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;IAC1B,QAAQ,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;CAC5C;AAED,eAAO,MAAM,KAAK,EAAE,EAAE,CAAC,UAAU,CAkBhC,CAAC"}
+{"version":3,"file":"await.d.ts","sourceRoot":"","sources":["../src/await.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAQ,iBAAiB,EAAgB,SAAS,EAAqB,MAAM,OAAO,CAAC;AAGhG,oBAAY,UAAU,GAAG,iBAAiB,CAAC;IACvC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;IAC1B,QAAQ,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;CAC5C,CAAC,CAAC;AAEH,eAAO,MAAM,KAAK,EAAE,EAAE,CAAC,UAAU,CAsBhC,CAAC"}

package/dist/await.js

@@ -9,7 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { jsx as _jsx } from "react/jsx-runtime";
 import { lazy, Suspense, useMemo } from 'react';
-export const Await = ({ promises, fallback = _jsx("h2", { children: "Loading..." }), children }) => {
+import { defaultLoadingFallback } from './fallbacks';
+export const Await = ({ promises, fallback = defaultLoadingFallback, children, }) => {
     const Lazy = useMemo(() => lazy(() => __awaiter(void 0, void 0, void 0, function* () {
         yield Promise.all(promises);
         return {

package/dist/await.js.map

@@ -1 +1 @@
-{"version":3,"file":"await.js","sourceRoot":"","sources":["../src/await.tsx"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAM,IAAI,EAA2B,QAAQ,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAO7E,MAAM,CAAC,MAAM,KAAK,GAAmB,CAAC,EAAE,QAAQ,EAAE,QAAQ,GAAG,sCAAmB,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC5F,MAAM,IAAI,GAAG,OAAO,CAChB,GAAG,EAAE,CACD,IAAI,CAAK,GAAS,EAAE;QAChB,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE5B,OAAO;YACH,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAwB;SACtD,CAAC;IACN,CAAC,CAAA,CAAC,EACN,CAAC,QAAQ,CAAC,CACb,CAAC;IAEF,OAAO,CACH,KAAC,QAAQ,kBAAC,QAAQ,EAAE,QAAQ,gBACxB,KAAC,IAAI,cAAE,QAAQ,GAAQ,IAChB,CACd,CAAC;AACN,CAAC,CAAC"}
+{"version":3,"file":"await.js","sourceRoot":"","sources":["../src/await.tsx"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAM,IAAI,EAA8C,QAAQ,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChG,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAOrD,MAAM,CAAC,MAAM,KAAK,GAAmB,CAAC,EAClC,QAAQ,EACR,QAAQ,GAAG,sBAAsB,EACjC,QAAQ,GACX,EAAE,EAAE;IACD,MAAM,IAAI,GAAG,OAAO,CAChB,GAAG,EAAE,CACD,IAAI,CAA4B,GAAS,EAAE;QACvC,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE5B,OAAO;YACH,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAwB;SACtD,CAAC;IACN,CAAC,CAAA,CAAC,EACN,CAAC,QAAQ,CAAC,CACb,CAAC;IAEF,OAAO,CACH,KAAC,QAAQ,kBAAC,QAAQ,EAAE,QAAQ,gBACxB,KAAC,IAAI,cAAE,QAAQ,GAAQ,IAChB,CACd,CAAC;AACN,CAAC,CAAC"}

package/dist/fallbacks.d.ts

@@ -0,0 +1,3 @@
+export declare const defaultLoadingFallback: import("react/jsx-runtime").JSX.Element;
+export declare const defaultErrorFallback: import("react/jsx-runtime").JSX.Element;
+//# sourceMappingURL=fallbacks.d.ts.map

package/dist/fallbacks.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fallbacks.d.ts","sourceRoot":"","sources":["../src/fallbacks.tsx"],"names":[],"mappings":"AAAA,eAAO,MAAM,sBAAsB,yCAAsB,CAAC;AAC1D,eAAO,MAAM,oBAAoB,yCAAuC,CAAC"}

package/dist/fallbacks.js

@@ -0,0 +1,4 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+export const defaultLoadingFallback = _jsx("h2", { children: "Loading..." });
+export const defaultErrorFallback = _jsx("h2", Object.assign({ className: "c-red-500" }, { children: "Error" }));
+//# sourceMappingURL=fallbacks.js.map

package/dist/fallbacks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fallbacks.js","sourceRoot":"","sources":["../src/fallbacks.tsx"],"names":[],"mappings":";AAAA,MAAM,CAAC,MAAM,sBAAsB,GAAG,sCAAmB,CAAC;AAC1D,MAAM,CAAC,MAAM,oBAAoB,GAAG,2BAAI,SAAS,EAAC,WAAW,2BAAW,CAAC"}

package/dist/provide.d.ts

@@ -1,14 +1,15 @@
-import { ReactInstance, StatelessComponent, ComponentClass, ClassicComponentClass } from 'react';
-import { ProviderConfigEntry } from './provider';
+import { ComponentType, ReactInstance } from 'react';
+import { ProviderConfigEntrySingletons, ProviderConfigEntryInstances } from './provider';
 export interface WrappedComponent<P> {
-    wrappedComponent: ReactComponent<P>;
+    wrappedComponent: ComponentType<P>;
     wrappedInstance: ReactInstance | undefined;
 }
-declare type ReactComponent<P = any> = StatelessComponent<P> | ComponentClass<P> | ClassicComponentClass<P>;
-declare type ProvideDecorator = (stores: {
-    singletons?: ProviderConfigEntry<any>[];
-    instances?: ProviderConfigEntry<any>[];
-}, fallback?: JSX.Element) => <T extends ReactComponent>(target: T) => T & WrappedComponent<T>;
+export declare type ProvideDecorator = (stores: {
+    singletons?: ProviderConfigEntrySingletons<any>[];
+    instances?: ProviderConfigEntryInstances<any>[];
+}, options?: {
+    loadingFallback?: JSX.Element;
+    errorFallback?: JSX.Element;
+}) => <T extends ComponentType>(target: T) => T & WrappedComponent<T>;
 export declare const provide: ProvideDecorator;
-export {};
 //# sourceMappingURL=provide.d.ts.map

package/dist/provide.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provide.d.ts","sourceRoot":"","sources":["../src/provide.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,OAAO,CAAC;AAEjG,OAAO,EAAY,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAE3D,MAAM,WAAW,gBAAgB,CAAC,CAAC;IAC/B,gBAAgB,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC;IACpC,eAAe,EAAE,aAAa,GAAG,SAAS,CAAC;CAC9C;AAED,aAAK,cAAc,CAAC,CAAC,GAAG,GAAG,IAAI,kBAAkB,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAAC;AAEpG,aAAK,gBAAgB,GAAG,CACpB,MAAM,EAAE;IACJ,UAAU,CAAC,EAAE,mBAAmB,CAAC,GAAG,CAAC,EAAE,CAAC;IACxC,SAAS,CAAC,EAAE,mBAAmB,CAAC,GAAG,CAAC,EAAE,CAAC;CAC1C,EACD,QAAQ,CAAC,EAAE,GAAG,CAAC,OAAO,KACrB,CAAC,CAAC,SAAS,cAAc,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;AAEtE,eAAO,MAAM,OAAO,kBAKM,CAAC"}
+{"version":3,"file":"provide.d.ts","sourceRoot":"","sources":["../src/provide.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAErD,OAAO,EAAY,6BAA6B,EAAE,4BAA4B,EAAE,MAAM,YAAY,CAAC;AAEnG,MAAM,WAAW,gBAAgB,CAAC,CAAC;IAC/B,gBAAgB,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;IACnC,eAAe,EAAE,aAAa,GAAG,SAAS,CAAC;CAC9C;AAED,oBAAY,gBAAgB,GAAG,CAC3B,MAAM,EAAE;IACJ,UAAU,CAAC,EAAE,6BAA6B,CAAC,GAAG,CAAC,EAAE,CAAC;IAClD,SAAS,CAAC,EAAE,4BAA4B,CAAC,GAAG,CAAC,EAAE,CAAC;CACnD,EACD,OAAO,CAAC,EAAE;IACN,eAAe,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC;IAC9B,aAAa,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC;CAC/B,KACA,CAAC,CAAC,SAAS,aAAa,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;AAErE,eAAO,MAAM,OAAO,kBASM,CAAC"}

package/dist/provide.js

@@ -1,4 +1,4 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Provider } from './provider';
-export const provide = ((stores, fallback) => (Component) => props => (_jsx(Provider, Object.assign({}, stores, { fallback: fallback }, { children: _jsx(Component, Object.assign({}, props)) }))));
+export const provide = ((stores, options) => (Component) => props => (_jsx(Provider, Object.assign({}, stores, { loadingFallback: options === null || options === void 0 ? void 0 : options.loadingFallback, errorFallback: options === null || options === void 0 ? void 0 : options.errorFallback }, { children: _jsx(Component, Object.assign({}, props)) }))));
 //# sourceMappingURL=provide.js.map

package/dist/provide.js.map

@@ -1 +1 @@
-{"version":3,"file":"provide.js","sourceRoot":"","sources":["../src/provide.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,QAAQ,EAAuB,MAAM,YAAY,CAAC;AAiB3D,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,SAAyB,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CACjF,CACI,KAAC,QAAQ,oBAAK,MAAM,IAAE,QAAQ,EAAE,QAAQ,gBACpC,KAAC,SAAS,oBAAK,KAAK,EAAI,IACjB,CACd,CAAqB,CAAC"}
+{"version":3,"file":"provide.js","sourceRoot":"","sources":["../src/provide.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,QAAQ,EAA+D,MAAM,YAAY,CAAC;AAkBnG,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,SAAwB,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAC/E,CACI,KAAC,QAAQ,oBACD,MAAM,IACV,eAAe,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,EACzC,aAAa,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,gBAErC,KAAC,SAAS,oBAAK,KAAK,EAAI,IACjB,CACd,CAAqB,CAAC"}

package/dist/provider.d.ts

@@ -1,20 +1,31 @@
-import { FC } from 'react';
+import { FC, PropsWithChildren, ReactElement } from 'react';
 import { interfaces } from 'inversify';
 import { Token, SymbolToken } from './common';
-export declare type ProviderConfigEntry<T> = interfaces.Newable<T> | ClassProviderConfigEntry<T> | ValueProviderConfigEntry<T>;
-interface ClassProviderConfigEntry<T> {
+export declare type ProviderConfigEntrySingletons<T> = ClassProviderConfigEntry<T> | ValueProviderConfigEntry<T>;
+export declare type ProviderConfigEntryInstances<T> = ClassProviderConfigEntryNoInherit<T>;
+export declare type ProviderConfigEntry<T> = ProviderConfigEntrySingletons<T> | ProviderConfigEntryInstances<T>;
+declare type ClassProviderConfigEntry<T> = interfaces.Newable<T> | ClassProviderConfigEntryUseClass<T> | ClassProviderConfigEntryToken<T>;
+declare type ClassProviderConfigEntryNoInherit<T> = interfaces.Newable<T> | Omit<ClassProviderConfigEntryUseClass<T>, 'inherit'>;
+interface ClassProviderConfigEntryUseClass<T> {
     provide: Token<T>;
     useClass: interfaces.Newable<T>;
+    inherit?: true;
+}
+interface ClassProviderConfigEntryToken<T> {
+    provide: interfaces.Newable<T>;
+    inherit?: true;
 }
 interface ValueProviderConfigEntry<T> {
     provide: SymbolToken<T> | interfaces.Abstract<T>;
     useValue: T;
+    inherit?: true;
 }
-export interface ProviderProps {
-    singletons?: ProviderConfigEntry<any>[];
-    instances?: ProviderConfigEntry<any>[];
-    fallback?: JSX.Element;
-}
+export declare type ProviderProps = PropsWithChildren<{
+    singletons?: ProviderConfigEntrySingletons<any>[];
+    instances?: ProviderConfigEntryInstances<any>[];
+    loadingFallback?: ReactElement;
+    errorFallback?: ReactElement;
+}>;
 export declare const Provider: FC<ProviderProps>;
 export {};
 //# sourceMappingURL=provider.d.ts.map

package/dist/provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAyC,MAAM,OAAO,CAAC;AAElE,OAAO,EAAa,UAAU,EAAE,MAAM,WAAW,CAAC;AAGlD,OAAO,EAAoB,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAGhE,oBAAY,mBAAmB,CAAC,CAAC,IAC3B,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,GACrB,wBAAwB,CAAC,CAAC,CAAC,GAC3B,wBAAwB,CAAC,CAAC,CAAC,CAAC;AAElC,UAAU,wBAAwB,CAAC,CAAC;IAChC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAClB,QAAQ,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;CACnC;AAED,UAAU,wBAAwB,CAAC,CAAC;IAChC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACjD,QAAQ,EAAE,CAAC,CAAC;CACf;AAoBD,MAAM,WAAW,aAAa;IAC1B,UAAU,CAAC,EAAE,mBAAmB,CAAC,GAAG,CAAC,EAAE,CAAC;IACxC,SAAS,CAAC,EAAE,mBAAmB,CAAC,GAAG,CAAC,EAAE,CAAC;IACvC,QAAQ,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC;CAC1B;AAED,eAAO,MAAM,QAAQ,EAAE,EAAE,CAAC,aAAa,CA2FtC,CAAC"}
+{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../src/provider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,iBAAiB,EAAE,YAAY,EAAyC,MAAM,OAAO,CAAC;AAEnG,OAAO,EAAa,UAAU,EAAE,MAAM,WAAW,CAAC;AAGlD,OAAO,EAAoB,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAIhE,oBAAY,6BAA6B,CAAC,CAAC,IACrC,wBAAwB,CAAC,CAAC,CAAC,GAC3B,wBAAwB,CAAC,CAAC,CAAC,CAAC;AAClC,oBAAY,4BAA4B,CAAC,CAAC,IAAI,iCAAiC,CAAC,CAAC,CAAC,CAAC;AACnF,oBAAY,mBAAmB,CAAC,CAAC,IAC3B,6BAA6B,CAAC,CAAC,CAAC,GAChC,4BAA4B,CAAC,CAAC,CAAC,CAAC;AAEtC,aAAK,wBAAwB,CAAC,CAAC,IACzB,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,GACrB,gCAAgC,CAAC,CAAC,CAAC,GACnC,6BAA6B,CAAC,CAAC,CAAC,CAAC;AAEvC,aAAK,iCAAiC,CAAC,CAAC,IAClC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,GACrB,IAAI,CAAC,gCAAgC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;AAE3D,UAAU,gCAAgC,CAAC,CAAC;IACxC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAClB,QAAQ,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,IAAI,CAAC;CAClB;AAED,UAAU,6BAA6B,CAAC,CAAC;IACrC,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC/B,OAAO,CAAC,EAAE,IAAI,CAAC;CAClB;AAED,UAAU,wBAAwB,CAAC,CAAC;IAChC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACjD,QAAQ,EAAE,CAAC,CAAC;IACZ,OAAO,CAAC,EAAE,IAAI,CAAC;CAClB;AA8GD,oBAAY,aAAa,GAAG,iBAAiB,CAAC;IAC1C,UAAU,CAAC,EAAE,6BAA6B,CAAC,GAAG,CAAC,EAAE,CAAC;IAClD,SAAS,CAAC,EAAE,4BAA4B,CAAC,GAAG,CAAC,EAAE,CAAC;IAChD,eAAe,CAAC,EAAE,YAAY,CAAC;IAC/B,aAAa,CAAC,EAAE,YAAY,CAAC;CAChC,CAAC,CAAC;AAEH,eAAO,MAAM,QAAQ,EAAE,EAAE,CAAC,aAAa,CAmFtC,CAAC"}

package/dist/provider.js

@@ -3,65 +3,106 @@ import { useState, useContext, useLayoutEffect } from 'react';
 import { Container } from 'inversify';
 import { Await } from './await';
 import { ContainerContext } from './common';
+import { defaultErrorFallback, defaultLoadingFallback } from './fallbacks';
 import { isStore } from './store';
-function isClassProviderConfigEntry(entry) {
-    return (Object.prototype.hasOwnProperty.call(entry, 'provide') &&
-        Object.prototype.hasOwnProperty.call(entry, 'useClass'));
+function isClassProviderConfigEntryUseClass(entry) {
+    return Object.hasOwn(entry, 'provide') && Object.hasOwn(entry, 'useClass');
 }
 function isValueProviderConfigEntry(entry) {
-    return (Object.prototype.hasOwnProperty.call(entry, 'provide') &&
-        Object.prototype.hasOwnProperty.call(entry, 'useValue'));
+    return Object.hasOwn(entry, 'provide') && Object.hasOwn(entry, 'useValue');
 }
-export const Provider = ({ singletons, instances, fallback, children }) => {
+function isClassProviderConfigEntryToken(entry) {
+    return (Object.hasOwn(entry, 'provide') &&
+        !Object.hasOwn(entry, 'useClass') &&
+        !Object.hasOwn(entry, 'useValue'));
+}
+function isProviderConfigEntryInheritable(entry) {
+    return (isClassProviderConfigEntryUseClass(entry) ||
+        isClassProviderConfigEntryToken(entry) ||
+        isValueProviderConfigEntry(entry));
+}
+function getProvideTokenWithClass(entry) {
+    if (isClassProviderConfigEntryUseClass(entry)) {
+        return [entry.provide, entry.useClass];
+    }
+    if (isClassProviderConfigEntryToken(entry)) {
+        return [entry.provide, entry.provide];
+    }
+    if (isValueProviderConfigEntry(entry)) {
+        return [undefined, undefined];
+    }
+    return [entry, entry];
+}
+function getStoreInstances(container, singletons = [], instances = []) {
+    return [...singletons, ...instances].reduce((out, entry) => {
+        const [provide, useClass] = getProvideTokenWithClass(entry);
+        if (provide && useClass && container.isCurrentBound(provide) && isStore(useClass)) {
+            out.push(container.get(provide));
+        }
+        return out;
+    }, []);
+}
+const bindEntry = (container, checkInherit) => (entry) => {
+    if (checkInherit &&
+        isProviderConfigEntryInheritable(entry) &&
+        entry.inherit &&
+        container.isBound(entry.provide)) {
+        return undefined;
+    }
+    if (isClassProviderConfigEntryUseClass(entry)) {
+        return container.bind(entry.provide).to(entry.useClass);
+    }
+    if (isClassProviderConfigEntryToken(entry)) {
+        return container.bind(entry.provide).to(entry.provide);
+    }
+    if (isValueProviderConfigEntry(entry)) {
+        // using toDynamicValue to return BindingInSyntax
+        return container.bind(entry.provide).toDynamicValue(() => entry.useValue);
+    }
+    return container.bind(entry).to(entry);
+};
+const unbindEntry = (container) => (entry) => {
+    if (isClassProviderConfigEntryUseClass(entry) ||
+        isValueProviderConfigEntry(entry) ||
+        isClassProviderConfigEntryToken(entry)) {
+        return container.unbind(entry.provide);
+    }
+    return container.unbind(entry);
+};
+export const Provider = ({ singletons, instances, loadingFallback = defaultLoadingFallback, errorFallback = defaultErrorFallback, children, }) => {
     const parentContainer = useContext(ContainerContext);
     const [container, setContainer] = useState();
-    const [promises, setPromises] = useState();
+    const [promises, setPromises] = useState([]);
+    const [error, setError] = useState(false);
     useLayoutEffect(() => {
         const container = new Container();
         container.parent = parentContainer;
-        const bind = (entry) => {
-            if (isClassProviderConfigEntry(entry)) {
-                return container.bind(entry.provide).to(entry.useClass);
-            }
-            if (isValueProviderConfigEntry(entry)) {
-                // using toDynamicValue to return BindingInSyntax
-                return container.bind(entry.provide).toDynamicValue(() => entry.useValue);
-            }
-            return container.bind(entry).to(entry);
-        };
-        singletons === null || singletons === void 0 ? void 0 : singletons.map(bind).forEach(binding => {
-            binding.inSingletonScope();
+        singletons === null || singletons === void 0 ? void 0 : singletons.map(bindEntry(container, true)).forEach(binding => {
+            binding === null || binding === void 0 ? void 0 : binding.inSingletonScope();
         });
-        instances === null || instances === void 0 ? void 0 : instances.forEach(bind);
-        const storeInstances = [...(singletons !== null && singletons !== void 0 ? singletons : []), ...(instances !== null && instances !== void 0 ? instances : [])]
-            .map(entry => {
-            if (isValueProviderConfigEntry(entry)) {
-                return undefined;
-            }
-            const { provide, useClass } = isClassProviderConfigEntry(entry)
-                ? entry
-                : { provide: entry, useClass: entry };
-            if (isStore(useClass)) {
-                return container.get(provide);
-            }
-            return undefined;
-        })
-            .filter(Boolean);
+        instances === null || instances === void 0 ? void 0 : instances.forEach(bindEntry(container, false));
+        const storeInstances = getStoreInstances(container, singletons, instances);
         const promises = [];
         for (const instance of storeInstances) {
             if (instance.initialize) {
-                promises.push(instance.initialize());
+                let promise;
+                try {
+                    promise = instance.initialize();
+                }
+                catch (_a) {
+                    setError(true);
+                }
+                if (promise && typeof promise.catch === 'function') {
+                    promises.push(promise.catch(() => {
+                        setError(true);
+                    }));
+                }
             }
         }
         setContainer(container);
         setPromises(promises);
         return () => {
-            const unbind = (entry) => {
-                if (isClassProviderConfigEntry(entry) || isValueProviderConfigEntry(entry)) {
-                    return container.unbind(entry.provide);
-                }
-                return container.unbind(entry);
-            };
+            const unbind = unbindEntry(container);
             singletons === null || singletons === void 0 ? void 0 : singletons.forEach(unbind);
             instances === null || instances === void 0 ? void 0 : instances.forEach(unbind);
             for (const instance of storeInstances) {
@@ -74,6 +115,15 @@ export const Provider = ({ singletons, instances, fallback, children }) => {
     if (!container) {
         return null;
     }
-    return (_jsx(ContainerContext.Provider, Object.assign({ value: container }, { children: (promises === null || promises === void 0 ? void 0 : promises.length) ? (_jsx(Await, Object.assign({ promises: promises, fallback: fallback }, { children: children }))) : (children) })));
+    const getContent = () => {
+        if (error) {
+            return errorFallback;
+        }
+        if (promises.length) {
+            return (_jsx(Await, Object.assign({ promises: promises, fallback: loadingFallback }, { children: children })));
+        }
+        return children;
+    };
+    return _jsx(ContainerContext.Provider, Object.assign({ value: container }, { children: getContent() }));
 };
 //# sourceMappingURL=provider.js.map

package/dist/provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAM,QAAQ,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAElE,OAAO,EAAE,SAAS,EAAc,MAAM,WAAW,CAAC;AAElD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,gBAAgB,EAAsB,MAAM,UAAU,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAiBlC,SAAS,0BAA0B,CAC/B,KAA6B;IAE7B,OAAO,CACH,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC;QACtD,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,CAC1D,CAAC;AACN,CAAC;AAED,SAAS,0BAA0B,CAC/B,KAA6B;IAE7B,OAAO,CACH,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC;QACtD,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,CAC1D,CAAC;AACN,CAAC;AAQD,MAAM,CAAC,MAAM,QAAQ,GAAsB,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE;IACzF,MAAM,eAAe,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAErD,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,EAAa,CAAC;IACxD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAmB,CAAC;IAE5D,eAAe,CAAC,GAAG,EAAE;QACjB,MAAM,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC;QAClC,SAAS,CAAC,MAAM,GAAG,eAAe,CAAC;QAEnC,MAAM,IAAI,GAAG,CAAC,KAA+B,EAAE,EAAE;YAC7C,IAAI,0BAA0B,CAAC,KAAK,CAAC,EAAE;gBACnC,OAAO,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;aAC3D;YAED,IAAI,0BAA0B,CAAC,KAAK,CAAC,EAAE;gBACnC,iDAAiD;gBACjD,OAAO,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;aAC7E;YAED,OAAO,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;QAC3C,CAAC,CAAC;QAEF,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;YACpC,OAAO,CAAC,gBAAgB,EAAE,CAAC;QAC/B,CAAC,CAAC,CAAC;QACH,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAEzB,MAAM,cAAc,GAAG,CAAC,GAAG,CAAC,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE,CAAC,EAAE,GAAG,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC,CAAC;aAC/D,GAAG,CAAC,KAAK,CAAC,EAAE;YACT,IAAI,0BAA0B,CAAC,KAAK,CAAC,EAAE;gBACnC,OAAO,SAAS,CAAC;aACpB;YAED,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,0BAA0B,CAAC,KAAK,CAAC;gBAC3D,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;YAE1C,IAAI,OAAO,CAAC,QAAQ,CAAC,EAAE;gBACnB,OAAO,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;aACjC;YAED,OAAO,SAAS,CAAC;QACrB,CAAC,CAAC;aACD,MAAM,CAAC,OAAO,CAAC,CAAC;QAErB,MAAM,QAAQ,GAAoB,EAAE,CAAC;QACrC,KAAK,MAAM,QAAQ,IAAI,cAAc,EAAE;YACnC,IAAI,QAAQ,CAAC,UAAU,EAAE;gBACrB,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;aACxC;SACJ;QAED,YAAY,CAAC,SAAS,CAAC,CAAC;QACxB,WAAW,CAAC,QAAQ,CAAC,CAAC;QAEtB,OAAO,GAAG,EAAE;YACR,MAAM,MAAM,GAAG,CAAC,KAA+B,EAAE,EAAE;gBAC/C,IAAI,0BAA0B,CAAC,KAAK,CAAC,IAAI,0BAA0B,CAAC,KAAK,CAAC,EAAE;oBACxE,OAAO,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;iBAC1C;gBAED,OAAO,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC,CAAC;YAEF,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YAC5B,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YAE3B,KAAK,MAAM,QAAQ,IAAI,cAAc,EAAE;gBACnC,IAAI,QAAQ,CAAC,OAAO,EAAE;oBAClB,QAAQ,CAAC,OAAO,EAAE,CAAC;iBACtB;aACJ;QACL,CAAC,CAAC;IACN,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,kDAAkD;IAE1D,IAAI,CAAC,SAAS,EAAE;QACZ,OAAO,IAAI,CAAC;KACf;IAED,OAAO,CACH,KAAC,gBAAgB,CAAC,QAAQ,kBAAC,KAAK,EAAE,SAAS,gBACtC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,EAAC,CAAC,CAAC,CAChB,KAAC,KAAK,kBAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,gBACxC,QAAQ,IACL,CACX,CAAC,CAAC,CAAC,CACA,QAAQ,CACX,IACuB,CAC/B,CAAC;AACN,CAAC,CAAC"}
+{"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.tsx"],"names":[],"mappings":"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"}

package/dist/store.d.ts

@@ -6,9 +6,7 @@ interface Identifier<T> extends interfaces.Newable<T> {
 export declare function isStore<T>(identifier: Identifier<T>): boolean | undefined;
 export declare abstract class Store {
     static [symbol]: boolean;
-}
-export interface Store {
-    initialize?(): Promise<void>;
+    initialize?(): Promise<void> | void;
     dispose?(): void;
 }
 export {};

package/dist/store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,UAAU,EAAE,MAAM,WAAW,CAAC;AAEnD,QAAA,MAAM,MAAM,eAAmC,CAAC;AAEhD,UAAU,UAAU,CAAC,CAAC,CAAE,SAAQ,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;IACjD,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAgB,OAAO,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,uBAEnD;AAED,8BACsB,KAAK;IACvB,MAAM,CAAC,CAAC,MAAM,CAAC,UAAQ;CAC1B;AAED,MAAM,WAAW,KAAK;IAClB,UAAU,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,OAAO,CAAC,IAAI,IAAI,CAAC;CACpB"}
+{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,UAAU,EAAE,MAAM,WAAW,CAAC;AAEnD,QAAA,MAAM,MAAM,eAAmC,CAAC;AAEhD,UAAU,UAAU,CAAC,CAAC,CAAE,SAAQ,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;IACjD,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAgB,OAAO,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,uBAEnD;AAED,8BACsB,KAAK;IACvB,MAAM,CAAC,CAAC,MAAM,CAAC,UAAQ;IAEvB,UAAU,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI;IACnC,OAAO,CAAC,IAAI,IAAI;CACnB"}

package/dist/store.js.map

@@ -1 +1 @@
-{"version":3,"file":"store.js","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":";;;;;;;AAAA,OAAO,EAAE,UAAU,EAAc,MAAM,WAAW,CAAC;AAEnD,MAAM,MAAM,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAMhD,MAAM,UAAU,OAAO,CAAI,UAAyB;IAChD,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;AAC9B,CAAC;AAGD,IAAsB,KAAK,GAA3B,MAAsB,KAAK;CAE1B,CAAA;KADW,MAAM;AAAP;;;;WAAW,IAAI;GAAC;AADL,KAAK;IAD1B,UAAU,EAAE;GACS,KAAK,CAE1B;SAFqB,KAAK"}
+{"version":3,"file":"store.js","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":";;;;;;;AAAA,OAAO,EAAE,UAAU,EAAc,MAAM,WAAW,CAAC;AAEnD,MAAM,MAAM,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAMhD,MAAM,UAAU,OAAO,CAAI,UAAyB;IAChD,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;AAC9B,CAAC;AAGD,IAAsB,KAAK,GAA3B,MAAsB,KAAK;CAK1B,CAAA;KAJW,MAAM;AAAP;;;;WAAW,IAAI;GAAC;AADL,KAAK;IAD1B,UAAU,EAAE;GACS,KAAK,CAK1B;SALqB,KAAK"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@servicetitan/react-ioc",
-    "version": "22.21.0",
+    "version": "23.1.0",
     "description": "",
     "homepage": "https://docs.st.dev/docs/frontend/react-ioc",
     "repository": {
@@ -19,11 +19,15 @@
         "reflect-metadata": "~0.1.13"
     },
     "devDependencies": {
-        "@types/react": "~17.0.38",
-        "react": "~17.0.2"
+        "@servicetitan/startup-jest": "^1.1.0",
+        "@testing-library/react": "^14.2.1",
+        "@types/react": "~18.2.55",
+        "@types/react-test-renderer": "~18.0.7",
+        "react": "~18.2.0",
+        "react-test-renderer": "~18.2.0"
     },
     "peerDependencies": {
-        "react": "~17.0.2"
+        "react": ">=17.0.2"
     },
     "publishConfig": {
         "access": "public"
@@ -31,5 +35,5 @@
     "cli": {
         "webpack": false
     },
-    "gitHead": "729b7ca4eb38c323ac538a73573cadd54a4ff839"
+    "gitHead": "7267270e54cdb3a2926f61feb4939d057e82adb3"
 }

package/src/__tests__/await.test.tsx

@@ -0,0 +1,21 @@
+import TestRenderer from 'react-test-renderer';
+import { Await } from '../await';
+import { waitFor } from '@testing-library/react';
+
+const TestContent = () => <div role="content">hello</div>;
+
+describe(`[react-ioc] ${Await.displayName}`, () => {
+    test('should render content when no promises are passed', async () => {
+        const { root } = TestRenderer.create(
+            <Await promises={[]}>
+                <TestContent />
+            </Await>
+        );
+
+        await TestRenderer.act(async () => {
+            await waitFor(() => {
+                expect(root.findByType(TestContent)).toBeTruthy();
+            });
+        });
+    });
+});

package/src/__tests__/provide.test.tsx

@@ -0,0 +1,343 @@
+import { PropsWithChildren, ReactElement, ReactNode, useEffect } from 'react';
+import { provide, inject, injectable, useDependencies, Store, symbolToken, Provider } from '..';
+import TestRenderer from 'react-test-renderer';
+import { waitFor } from '@testing-library/react';
+
+@injectable()
+class StatStore {
+    readonly id = 'stat';
+    counters: Record<string, number> = {};
+    queueCreate: string[] = [];
+    queueRender: string[] = [];
+
+    testInitialize: (id: string) => void = jest.fn();
+    testRender = (id: string) => {
+        this.queueRender.push(id);
+    };
+
+    register(name: string) {
+        if (!this.counters[name]) {
+            this.counters[name] = 0;
+        }
+
+        this.counters[name]++;
+
+        const id = `${name}-${this.counters[name]}`;
+        this.queueCreate.push(id);
+
+        return id;
+    }
+}
+
+@injectable()
+class StoreSimple {
+    readonly id;
+
+    constructor(@inject(StatStore) stat: StatStore) {
+        this.id = stat.register('StoreSimple');
+    }
+}
+
+@injectable()
+class StoreWithInitialize extends Store {
+    readonly id;
+
+    constructor(@inject(StatStore) private stat: StatStore) {
+        super();
+        this.id = stat.register('StoreWithInitialize');
+    }
+
+    initialize() {
+        this.stat.testInitialize(this.id);
+    }
+}
+
+type TestStore = typeof StoreSimple | typeof StoreWithInitialize | ReturnType<typeof symbolToken>;
+
+const getTestComponent = (inst: TestStore) => {
+    return ({ children }: PropsWithChildren<{}>) => {
+        const [{ id }, { testRender }] = useDependencies<[any, StatStore]>(inst, StatStore);
+        useEffect(() => {
+            testRender(id);
+        }, [testRender, id]);
+        return <div>{children}</div>;
+    };
+};
+
+type ProviderStoreProps = Parameters<typeof provide>[0];
+
+function TestProvider(props: PropsWithChildren<ProviderStoreProps & { store: TestStore }>) {
+    const { singletons, instances, children, store = StoreSimple } = props;
+    const Component = provide({ singletons, instances })(getTestComponent(store));
+    return <Component>{children}</Component>;
+}
+
+describe(`[react-ioc] ${provide.name}`, () => {
+    let stat!: StatStore;
+
+    const Stat = provide({ singletons: [StatStore] })(({ children }: PropsWithChildren<{}>) => {
+        const [statStore] = useDependencies(StatStore);
+        stat = statStore;
+        return <div>{children}</div>;
+    });
+
+    const subject = (children: ReactNode) => TestRenderer.create(<Stat>{children}</Stat>);
+
+    const expectQueueRenderToBe = (queueRender: string[]) =>
+        TestRenderer.act(async () => {
+            await waitFor(() => {
+                expect(stat.queueRender).toEqual(queueRender);
+            });
+        });
+
+    describe('check nested stores', () => {
+        describe('singletons', () => {
+            test('should reuse singletons for each container.get', async () => {
+                subject(
+                    <TestProvider store={StoreSimple} singletons={[StoreSimple]}>
+                        <TestProvider store={StoreSimple} />
+                    </TestProvider>
+                );
+
+                expect(stat.queueCreate).toEqual(['StoreSimple-1']);
+
+                await expectQueueRenderToBe(['StoreSimple-1', 'StoreSimple-1']);
+            });
+
+            test('should create separate singletons for nested tokens', async () => {
+                subject(
+                    <TestProvider store={StoreSimple} singletons={[StoreSimple]}>
+                        <TestProvider store={StoreSimple} singletons={[StoreSimple]} />
+                    </TestProvider>
+                );
+
+                expect(stat.queueCreate).toEqual(['StoreSimple-1', 'StoreSimple-2']);
+
+                await expectQueueRenderToBe(['StoreSimple-1', 'StoreSimple-2']);
+            });
+
+            test('should reuse singleton when using provide inheritance and instance exists', async () => {
+                subject(
+                    <TestProvider store={StoreSimple} singletons={[StoreSimple]}>
+                        <TestProvider
+                            store={StoreSimple}
+                            singletons={[{ provide: StoreSimple, inherit: true }]}
+                        />
+                    </TestProvider>
+                );
+
+                expect(stat.queueCreate).toEqual(['StoreSimple-1']);
+
+                await expectQueueRenderToBe(['StoreSimple-1', 'StoreSimple-1']);
+            });
+
+            test('should create singletons when using provide inheritance and instance not exists', () => {
+                subject(
+                    <TestProvider
+                        store={StoreSimple}
+                        singletons={[{ provide: StoreSimple, inherit: true }]}
+                    >
+                        <TestProvider store={StoreSimple} singletons={[StoreSimple]} />
+                    </TestProvider>
+                );
+
+                expect(stat.queueCreate).toEqual(['StoreSimple-1', 'StoreSimple-2']);
+            });
+        });
+
+        describe('instances', () => {
+            test('should create separate instances for each container.get', async () => {
+                subject(
+                    <TestProvider store={StoreSimple} instances={[StoreSimple]}>
+                        <TestProvider store={StoreSimple} />
+                    </TestProvider>
+                );
+
+                expect(stat.queueCreate).toEqual(['StoreSimple-1', 'StoreSimple-2']);
+
+                await expectQueueRenderToBe(['StoreSimple-1', 'StoreSimple-2']);
+            });
+
+            test('should create separate instances for nested tokens', async () => {
+                subject(
+                    <TestProvider store={StoreSimple} instances={[StoreSimple]}>
+                        <TestProvider store={StoreSimple} instances={[StoreSimple]} />
+                    </TestProvider>
+                );
+
+                expect(stat.queueCreate).toEqual(['StoreSimple-1', 'StoreSimple-2']);
+
+                await expectQueueRenderToBe(['StoreSimple-1', 'StoreSimple-2']);
+            });
+        });
+
+        describe('useValue', () => {
+            const valueToken = symbolToken('valueToken');
+
+            test('create new values', async () => {
+                subject(
+                    <TestProvider
+                        store={valueToken}
+                        singletons={[{ provide: valueToken, useValue: { id: 'value1' } }]}
+                    >
+                        <TestProvider
+                            store={valueToken}
+                            singletons={[{ provide: valueToken, useValue: { id: 'value2' } }]}
+                        />
+                    </TestProvider>
+                );
+
+                await expectQueueRenderToBe(['value1', 'value2']);
+            });
+
+            test('reuse nested values', async () => {
+                subject(
+                    <TestProvider
+                        store={valueToken}
+                        singletons={[{ provide: valueToken, useValue: { id: 'value1' } }]}
+                    >
+                        <TestProvider
+                            store={valueToken}
+                            singletons={[
+                                { provide: valueToken, useValue: { id: 'value2' }, inherit: true },
+                            ]}
+                        />
+                    </TestProvider>
+                );
+
+                await expectQueueRenderToBe(['value1', 'value1']);
+            });
+
+            test('no reuse nested values for instances', async () => {
+                subject(
+                    <TestProvider
+                        store={valueToken}
+                        singletons={[{ provide: valueToken, useValue: { id: 'value1' } }]}
+                    >
+                        <TestProvider
+                            store={valueToken}
+                            instances={[
+                                {
+                                    provide: valueToken,
+                                    useValue: { id: 'value2' },
+                                    inherit: true,
+                                } as any,
+                            ]}
+                        />
+                    </TestProvider>
+                );
+
+                await expectQueueRenderToBe(['value1', 'value2']);
+            });
+        });
+    });
+
+    describe('check store initialization', () => {
+        test('should wait for store initialization', async () => {
+            subject(
+                <TestProvider store={StoreWithInitialize} singletons={[StoreWithInitialize]} />
+            );
+
+            expect(stat.queueRender).toEqual([]);
+
+            await TestRenderer.act(async () => {
+                await waitFor(() => {
+                    expect(stat.testInitialize).toHaveBeenCalledWith('StoreWithInitialize-1');
+                });
+            });
+
+            await expectQueueRenderToBe(['StoreWithInitialize-1']);
+        });
+        test('should wait for for nested initialization', async () => {
+            subject(
+                <TestProvider store={StoreWithInitialize} singletons={[StoreWithInitialize]}>
+                    <TestProvider store={StoreWithInitialize} singletons={[StoreWithInitialize]} />
+                </TestProvider>
+            );
+
+            await TestRenderer.act(async () => {
+                await waitFor(() => {
+                    expect(stat.testInitialize).toHaveBeenCalledWith('StoreWithInitialize-1');
+                });
+
+                await waitFor(() => {
+                    expect(stat.testInitialize).toHaveBeenCalledWith('StoreWithInitialize-2');
+                });
+            });
+
+            expect(stat.queueCreate).toEqual(['StoreWithInitialize-1', 'StoreWithInitialize-2']);
+
+            await expectQueueRenderToBe(['StoreWithInitialize-1', 'StoreWithInitialize-2']);
+        });
+        test('should initialize only once when store is reused', async () => {
+            subject(
+                <TestProvider store={StoreWithInitialize} singletons={[StoreWithInitialize]}>
+                    <TestProvider
+                        store={StoreWithInitialize}
+                        singletons={[{ provide: StoreWithInitialize, inherit: true }]}
+                    />
+                </TestProvider>
+            );
+
+            await TestRenderer.act(async () => {
+                await waitFor(() => {
+                    expect(stat.testInitialize).toHaveBeenCalledWith('StoreWithInitialize-1');
+                });
+            });
+
+            expect(stat.queueCreate).toEqual(['StoreWithInitialize-1']);
+            await expectQueueRenderToBe(['StoreWithInitialize-1', 'StoreWithInitialize-1']);
+            expect(stat.testInitialize).toHaveBeenCalledTimes(1);
+        });
+
+        describe('error initialization', () => {
+            @injectable()
+            class StoreWithErrorInitialize extends Store {
+                initialize() {
+                    throw new Error('error');
+                }
+            }
+            @injectable()
+            class StoreWithAsyncErrorInitialize extends Store {
+                async initialize() {
+                    await new Promise<void>(resolve => resolve());
+                    throw new Error('error');
+                }
+            }
+
+            const subject = async (
+                children: ReactElement
+            ): Promise<ReturnType<typeof TestRenderer.create>> => {
+                let result: ReturnType<typeof TestRenderer.create> | undefined = undefined;
+
+                await TestRenderer.act(async () => {
+                    // we need this function to be async because of TestRenderer warnings
+                    await new Promise<void>(resolve => resolve());
+                    result = TestRenderer.create(children);
+                });
+
+                if (!result) {
+                    throw new Error();
+                }
+
+                return result;
+            };
+
+            test('async error initialization should show error', async () => {
+                const { root } = await subject(
+                    <Provider singletons={[StoreWithAsyncErrorInitialize]}>hello</Provider>
+                );
+
+                expect(root.findByType('h2')).toBeTruthy();
+            });
+
+            test('sync error initialization should show error', async () => {
+                const { root } = await subject(
+                    <Provider singletons={[StoreWithErrorInitialize]}>hello</Provider>
+                );
+
+                expect(root.findByType('h2')).toBeTruthy();
+            });
+        });
+    });
+});

package/src/__tests__/react-ioc.test.tsx

@@ -1,4 +1,4 @@
-import { Component, createContext, useRef, FC } from 'react';
+import { Component, createContext, useRef, FC, PropsWithChildren } from 'react';
 import {
     provide,
     injectDependency,
@@ -33,9 +33,9 @@ abstract class SampleConfig {
     title!: string;
 }
 
-const SampleConsumer: FC<{
-    setContainer(container: Container): void;
-}> = props => (
+const SampleConsumer: FC<
+    PropsWithChildren<{ setContainer(container: Container): void }>
+> = props => (
     <ContainerContext.Consumer>
         {container => {
             props.setContainer(container);

package/src/await.tsx

@@ -1,14 +1,19 @@
-import { FC, lazy, ReactElement, ReactNode, Suspense, useMemo } from 'react';
+import { FC, lazy, PropsWithChildren, ReactElement, ReactNode, Suspense, useMemo } from 'react';
+import { defaultLoadingFallback } from './fallbacks';
 
-export interface AwaitProps {
+export type AwaitProps = PropsWithChildren<{
     promises: Promise<void>[];
     fallback?: NonNullable<ReactNode> | null;
-}
+}>;
 
-export const Await: FC<AwaitProps> = ({ promises, fallback = <h2>Loading...</h2>, children }) => {
+export const Await: FC<AwaitProps> = ({
+    promises,
+    fallback = defaultLoadingFallback,
+    children,
+}) => {
     const Lazy = useMemo(
         () =>
-            lazy<FC>(async () => {
+            lazy<FC<PropsWithChildren<{}>>>(async () => {
                 await Promise.all(promises);
 
                 return {

package/src/fallbacks.tsx

@@ -0,0 +1,2 @@
+export const defaultLoadingFallback = <h2>Loading...</h2>;
+export const defaultErrorFallback = <h2 className="c-red-500">Error</h2>;

package/src/provide.tsx

@@ -1,25 +1,30 @@
-import { ReactInstance, StatelessComponent, ComponentClass, ClassicComponentClass } from 'react';
+import { ComponentType, ReactInstance } from 'react';
 
-import { Provider, ProviderConfigEntry } from './provider';
+import { Provider, ProviderConfigEntrySingletons, ProviderConfigEntryInstances } from './provider';
 
 export interface WrappedComponent<P> {
-    wrappedComponent: ReactComponent<P>;
+    wrappedComponent: ComponentType<P>;
     wrappedInstance: ReactInstance | undefined;
 }
 
-type ReactComponent<P = any> = StatelessComponent<P> | ComponentClass<P> | ClassicComponentClass<P>;
-
-type ProvideDecorator = (
+export type ProvideDecorator = (
     stores: {
-        singletons?: ProviderConfigEntry<any>[];
-        instances?: ProviderConfigEntry<any>[];
+        singletons?: ProviderConfigEntrySingletons<any>[];
+        instances?: ProviderConfigEntryInstances<any>[];
     },
-    fallback?: JSX.Element
-) => <T extends ReactComponent>(target: T) => T & WrappedComponent<T>;
+    options?: {
+        loadingFallback?: JSX.Element;
+        errorFallback?: JSX.Element;
+    }
+) => <T extends ComponentType>(target: T) => T & WrappedComponent<T>;
 
-export const provide = ((stores, fallback) => (Component: ReactComponent) => props =>
+export const provide = ((stores, options) => (Component: ComponentType) => props =>
     (
-        <Provider {...stores} fallback={fallback}>
+        <Provider
+            {...stores}
+            loadingFallback={options?.loadingFallback}
+            errorFallback={options?.errorFallback}
+        >
             <Component {...props} />
         </Provider>
     )) as ProvideDecorator;

package/src/provider.tsx

@@ -1,100 +1,203 @@
-import { FC, useState, useContext, useLayoutEffect } from 'react';
+import { FC, PropsWithChildren, ReactElement, useState, useContext, useLayoutEffect } from 'react';
 
 import { Container, interfaces } from 'inversify';
 
 import { Await } from './await';
 import { ContainerContext, Token, SymbolToken } from './common';
-import { isStore } from './store';
+import { defaultErrorFallback, defaultLoadingFallback } from './fallbacks';
+import { isStore, Store } from './store';
 
-export type ProviderConfigEntry<T> =
-    | interfaces.Newable<T>
+export type ProviderConfigEntrySingletons<T> =
     | ClassProviderConfigEntry<T>
     | ValueProviderConfigEntry<T>;
+export type ProviderConfigEntryInstances<T> = ClassProviderConfigEntryNoInherit<T>;
+export type ProviderConfigEntry<T> =
+    | ProviderConfigEntrySingletons<T>
+    | ProviderConfigEntryInstances<T>;
+
+type ClassProviderConfigEntry<T> =
+    | interfaces.Newable<T>
+    | ClassProviderConfigEntryUseClass<T>
+    | ClassProviderConfigEntryToken<T>;
 
-interface ClassProviderConfigEntry<T> {
+type ClassProviderConfigEntryNoInherit<T> =
+    | interfaces.Newable<T>
+    | Omit<ClassProviderConfigEntryUseClass<T>, 'inherit'>;
+
+interface ClassProviderConfigEntryUseClass<T> {
     provide: Token<T>;
     useClass: interfaces.Newable<T>;
+    inherit?: true;
+}
+
+interface ClassProviderConfigEntryToken<T> {
+    provide: interfaces.Newable<T>;
+    inherit?: true;
 }
 
 interface ValueProviderConfigEntry<T> {
     provide: SymbolToken<T> | interfaces.Abstract<T>;
     useValue: T;
+    inherit?: true;
 }
 
-function isClassProviderConfigEntry<T>(
+function isClassProviderConfigEntryUseClass<T>(
     entry: ProviderConfigEntry<T>
-): entry is ClassProviderConfigEntry<T> {
+): entry is Omit<ClassProviderConfigEntryUseClass<T>, 'inherit'> {
+    return Object.hasOwn(entry, 'provide') && Object.hasOwn(entry, 'useClass');
+}
+
+function isValueProviderConfigEntry<T>(
+    entry: ProviderConfigEntry<T>
+): entry is Omit<ValueProviderConfigEntry<T>, 'inherit'> {
+    return Object.hasOwn(entry, 'provide') && Object.hasOwn(entry, 'useValue');
+}
+
+function isClassProviderConfigEntryToken<T>(
+    entry: ProviderConfigEntry<T>
+): entry is Omit<ClassProviderConfigEntryToken<T>, 'inherit'> {
     return (
-        Object.prototype.hasOwnProperty.call(entry, 'provide') &&
-        Object.prototype.hasOwnProperty.call(entry, 'useClass')
+        Object.hasOwn(entry, 'provide') &&
+        !Object.hasOwn(entry, 'useClass') &&
+        !Object.hasOwn(entry, 'useValue')
     );
 }
 
-function isValueProviderConfigEntry<T>(
+function isProviderConfigEntryInheritable<T>(
     entry: ProviderConfigEntry<T>
-): entry is ValueProviderConfigEntry<T> {
+): entry is
+    | ClassProviderConfigEntryUseClass<T>
+    | ClassProviderConfigEntryToken<T>
+    | ValueProviderConfigEntry<T> {
     return (
-        Object.prototype.hasOwnProperty.call(entry, 'provide') &&
-        Object.prototype.hasOwnProperty.call(entry, 'useValue')
+        isClassProviderConfigEntryUseClass(entry) ||
+        isClassProviderConfigEntryToken(entry) ||
+        isValueProviderConfigEntry(entry)
     );
 }
 
-export interface ProviderProps {
-    singletons?: ProviderConfigEntry<any>[];
-    instances?: ProviderConfigEntry<any>[];
-    fallback?: JSX.Element;
+function getProvideTokenWithClass<T>(
+    entry: ProviderConfigEntry<T>
+): [Token<T>, interfaces.Newable<T>] | [undefined, undefined] {
+    if (isClassProviderConfigEntryUseClass(entry)) {
+        return [entry.provide, entry.useClass];
+    }
+
+    if (isClassProviderConfigEntryToken(entry)) {
+        return [entry.provide, entry.provide];
+    }
+
+    if (isValueProviderConfigEntry(entry)) {
+        return [undefined, undefined];
+    }
+
+    return [entry, entry];
 }
 
-export const Provider: FC<ProviderProps> = ({ singletons, instances, fallback, children }) => {
-    const parentContainer = useContext(ContainerContext);
+function getStoreInstances(
+    container: Container,
+    singletons: ProviderConfigEntrySingletons<any>[] = [],
+    instances: ProviderConfigEntryInstances<any>[] = []
+): Store[] {
+    return [...singletons, ...instances].reduce((out, entry) => {
+        const [provide, useClass] = getProvideTokenWithClass(entry);
 
-    const [container, setContainer] = useState<Container>();
-    const [promises, setPromises] = useState<Promise<void>[]>();
+        if (provide && useClass && container.isCurrentBound(provide) && isStore(useClass)) {
+            out.push(container.get(provide));
+        }
 
-    useLayoutEffect(() => {
-        const container = new Container();
-        container.parent = parentContainer;
+        return out;
+    }, [] as Store[]);
+}
 
-        const bind = (entry: ProviderConfigEntry<any>) => {
-            if (isClassProviderConfigEntry(entry)) {
-                return container.bind(entry.provide).to(entry.useClass);
-            }
+const bindEntry =
+    (container: Container, checkInherit: boolean) => (entry: ProviderConfigEntry<any>) => {
+        if (
+            checkInherit &&
+            isProviderConfigEntryInheritable(entry) &&
+            entry.inherit &&
+            container.isBound(entry.provide)
+        ) {
+            return undefined;
+        }
 
-            if (isValueProviderConfigEntry(entry)) {
-                // using toDynamicValue to return BindingInSyntax
-                return container.bind(entry.provide).toDynamicValue(() => entry.useValue);
-            }
+        if (isClassProviderConfigEntryUseClass(entry)) {
+            return container.bind(entry.provide).to(entry.useClass);
+        }
 
-            return container.bind(entry).to(entry);
-        };
+        if (isClassProviderConfigEntryToken(entry)) {
+            return container.bind(entry.provide).to(entry.provide);
+        }
 
-        singletons?.map(bind).forEach(binding => {
-            binding.inSingletonScope();
-        });
-        instances?.forEach(bind);
+        if (isValueProviderConfigEntry(entry)) {
+            // using toDynamicValue to return BindingInSyntax
+            return container.bind(entry.provide).toDynamicValue(() => entry.useValue);
+        }
 
-        const storeInstances = [...(singletons ?? []), ...(instances ?? [])]
-            .map(entry => {
-                if (isValueProviderConfigEntry(entry)) {
-                    return undefined;
-                }
+        return container.bind(entry).to(entry);
+    };
 
-                const { provide, useClass } = isClassProviderConfigEntry(entry)
-                    ? entry
-                    : { provide: entry, useClass: entry };
+const unbindEntry = (container: Container) => (entry: ProviderConfigEntry<any>) => {
+    if (
+        isClassProviderConfigEntryUseClass(entry) ||
+        isValueProviderConfigEntry(entry) ||
+        isClassProviderConfigEntryToken(entry)
+    ) {
+        return container.unbind(entry.provide);
+    }
 
-                if (isStore(useClass)) {
-                    return container.get(provide);
-                }
+    return container.unbind(entry);
+};
+
+export type ProviderProps = PropsWithChildren<{
+    singletons?: ProviderConfigEntrySingletons<any>[];
+    instances?: ProviderConfigEntryInstances<any>[];
+    loadingFallback?: ReactElement;
+    errorFallback?: ReactElement;
+}>;
+
+export const Provider: FC<ProviderProps> = ({
+    singletons,
+    instances,
+    loadingFallback = defaultLoadingFallback,
+    errorFallback = defaultErrorFallback,
+    children,
+}) => {
+    const parentContainer = useContext(ContainerContext);
+
+    const [container, setContainer] = useState<Container>();
+    const [promises, setPromises] = useState<Promise<void>[]>([]);
+    const [error, setError] = useState(false);
 
-                return undefined;
-            })
-            .filter(Boolean);
+    useLayoutEffect(() => {
+        const container = new Container();
+        container.parent = parentContainer;
+
+        singletons?.map(bindEntry(container, true)).forEach(binding => {
+            binding?.inSingletonScope();
+        });
+        instances?.forEach(bindEntry(container, false));
+
+        const storeInstances = getStoreInstances(container, singletons, instances);
 
         const promises: Promise<void>[] = [];
         for (const instance of storeInstances) {
             if (instance.initialize) {
-                promises.push(instance.initialize());
+                let promise;
+
+                try {
+                    promise = instance.initialize();
+                } catch {
+                    setError(true);
+                }
+
+                if (promise && typeof promise.catch === 'function') {
+                    promises.push(
+                        promise.catch(() => {
+                            setError(true);
+                        })
+                    );
+                }
             }
         }
 
@@ -102,13 +205,7 @@ export const Provider: FC<ProviderProps> = ({ singletons, instances, fallback, c
         setPromises(promises);
 
         return () => {
-            const unbind = (entry: ProviderConfigEntry<any>) => {
-                if (isClassProviderConfigEntry(entry) || isValueProviderConfigEntry(entry)) {
-                    return container.unbind(entry.provide);
-                }
-
-                return container.unbind(entry);
-            };
+            const unbind = unbindEntry(container);
 
             singletons?.forEach(unbind);
             instances?.forEach(unbind);
@@ -125,15 +222,21 @@ export const Provider: FC<ProviderProps> = ({ singletons, instances, fallback, c
         return null;
     }
 
-    return (
-        <ContainerContext.Provider value={container}>
-            {promises?.length ? (
-                <Await promises={promises} fallback={fallback}>
+    const getContent = () => {
+        if (error) {
+            return errorFallback;
+        }
+
+        if (promises.length) {
+            return (
+                <Await promises={promises} fallback={loadingFallback}>
                     {children}
                 </Await>
-            ) : (
-                children
-            )}
-        </ContainerContext.Provider>
-    );
+            );
+        }
+
+        return children;
+    };
+
+    return <ContainerContext.Provider value={container}>{getContent()}</ContainerContext.Provider>;
 };

package/src/store.ts

@@ -13,9 +13,7 @@ export function isStore<T>(identifier: Identifier<T>) {
 @injectable()
 export abstract class Store {
     static [symbol] = true;
-}
 
-export interface Store {
-    initialize?(): Promise<void>;
+    initialize?(): Promise<void> | void;
     dispose?(): void;
 }