@xyo-network/react-error 4.1.7 → 4.1.9

package/dist/browser/components/ErrorBoundary/ThrownErrorBoundary.d.ts

@@ -1,17 +1,5 @@
+import type { ThrownErrorBoundaryProps } from '@xylabs/react-error';
 import type { ModuleError } from '@xyo-network/payload-model';
-import type { FC, ReactNode } from 'react';
-import type Rollbar from 'rollbar';
-export interface ThrownErrorBoundaryProps {
-    boundaryName?: string;
-    children: ReactNode;
-    errorComponent?: (e: ModuleError, boundaryName?: string) => ReactNode;
-    rethrow?: boolean;
-    rollbar?: Rollbar;
-    scope?: string;
-    title?: string;
-}
-export interface ThrownErrorBoundaryState {
-    xyoError?: ModuleError;
-}
-export declare const ThrownErrorBoundary: FC<ThrownErrorBoundaryProps>;
+import type { FC } from 'react';
+export declare const ThrownErrorBoundary: FC<ThrownErrorBoundaryProps<ModuleError>>;
 //# sourceMappingURL=ThrownErrorBoundary.d.ts.map

package/dist/browser/components/ErrorBoundary/ThrownErrorBoundary.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ThrownErrorBoundary.d.ts","sourceRoot":"","sources":["../../../../src/components/ErrorBoundary/ThrownErrorBoundary.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAE7D,OAAO,KAAK,EACC,EAAE,EAAE,SAAS,EACzB,MAAM,OAAO,CAAA;AAEd,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAKlC,MAAM,WAAW,wBAAwB;IACvC,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,SAAS,CAAA;IACnB,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,WAAW,EAAE,YAAY,CAAC,EAAE,MAAM,KAAK,SAAS,CAAA;IACrE,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,EAAE,WAAW,CAAA;CACvB;AA+CD,eAAO,MAAM,mBAAmB,EAAE,EAAE,CAAC,wBAAwB,CAQ5D,CAAA"}
+{"version":3,"file":"ThrownErrorBoundary.d.ts","sourceRoot":"","sources":["../../../../src/components/ErrorBoundary/ThrownErrorBoundary.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAA;AAEnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,OAAO,CAAA;AAI/B,eAAO,MAAM,mBAAmB,EAAE,EAAE,CAAC,wBAAwB,CAAC,WAAW,CAAC,CAEzE,CAAA"}

package/dist/browser/components/ErrorBoundary/ThrownErrorBoundaryBase.d.ts

@@ -0,0 +1,21 @@
+import type { ReactNode } from 'react';
+import type Rollbar from 'rollbar';
+/** @deprecated use from @xylabs/react-error instead */
+export type ErrorEx<T = void> = T extends void ? Error : T | Error;
+/** @deprecated use from @xylabs/react-error instead */
+export interface ThrownErrorBoundaryProps<T = void> {
+    boundaryName?: string;
+    children: ReactNode;
+    errorComponent?: (e: ErrorEx<T>, boundaryName?: string) => ReactNode;
+    rethrow?: boolean;
+    rollbar?: Rollbar;
+    scope?: string;
+    title?: string;
+}
+/** @deprecated use from @xylabs/react-error instead */
+export interface ThrownErrorBoundaryState<T = void> {
+    errorEx?: ErrorEx<T>;
+}
+/** @deprecated use from @xylabs/react-error instead */
+export declare function ThrownErrorBoundaryBase<T = void>({ rollbar, ...props }: ThrownErrorBoundaryProps<T>): JSX.Element;
+//# sourceMappingURL=ThrownErrorBoundaryBase.d.ts.map

package/dist/browser/components/ErrorBoundary/ThrownErrorBoundaryBase.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ThrownErrorBoundaryBase.d.ts","sourceRoot":"","sources":["../../../../src/components/ErrorBoundary/ThrownErrorBoundaryBase.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAa,SAAS,EAAE,MAAM,OAAO,CAAA;AAEjD,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAKlC,uDAAuD;AACvD,MAAM,MAAM,OAAO,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,SAAS,IAAI,GAAG,KAAK,GAAG,CAAC,GAAG,KAAK,CAAA;AAElE,uDAAuD;AACvD,MAAM,WAAW,wBAAwB,CAAC,CAAC,GAAG,IAAI;IAChD,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,SAAS,CAAA;IACnB,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,MAAM,KAAK,SAAS,CAAA;IACpE,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,uDAAuD;AACvD,MAAM,WAAW,wBAAwB,CAAC,CAAC,GAAG,IAAI;IAChD,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;CACrB;AA0CD,uDAAuD;AACvD,wBAAgB,uBAAuB,CAAC,CAAC,GAAG,IAAI,EAAE,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,EAAE,wBAAwB,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,OAAO,CAQjH"}

package/dist/browser/components/ErrorBoundary.d.ts

@@ -1,14 +1,17 @@
 import type { ErrorInfo, ReactNode } from 'react';
 import { Component } from 'react';
+/** @deprecated use from @xylabs/react-error instead */
 export interface ErrorBoundaryProps {
     children: ReactNode;
     fallback?: ReactNode;
     fallbackWithError?: (error: Error) => ReactNode;
     scope?: string;
 }
+/** @deprecated use from @xylabs/react-error instead */
 export interface ErrorBoundaryState {
     error?: Error;
 }
+/** @deprecated use from @xylabs/react-error instead */
 export declare class ErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState> {
     constructor(props: ErrorBoundaryProps);
     static getDerivedStateFromError(error: Error): {

package/dist/browser/components/ErrorBoundary.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ErrorBoundary.d.ts","sourceRoot":"","sources":["../../../src/components/ErrorBoundary.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACjD,OAAc,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAExC,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,SAAS,CAAA;IAEnB,QAAQ,CAAC,EAAE,SAAS,CAAA;IAEpB,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,SAAS,CAAA;IAC/C,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,KAAK,CAAA;CACd;AAED,qBAAa,aAAc,SAAQ,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;gBACtE,KAAK,EAAE,kBAAkB;IAKrC,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,KAAK;;;IAInC,iBAAiB,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS;IAIpD,MAAM;CA4BhB"}
+{"version":3,"file":"ErrorBoundary.d.ts","sourceRoot":"","sources":["../../../src/components/ErrorBoundary.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACjD,OAAc,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAExC,uDAAuD;AACvD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,SAAS,CAAA;IAEnB,QAAQ,CAAC,EAAE,SAAS,CAAA;IAEpB,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,SAAS,CAAA;IAC/C,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,uDAAuD;AACvD,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,KAAK,CAAA;CACd;AAED,uDAAuD;AACvD,qBAAa,aAAc,SAAQ,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;gBACtE,KAAK,EAAE,kBAAkB;IAKrC,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,KAAK;;;IAInC,iBAAiB,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS;IAIpD,MAAM;CA4BhB"}

package/dist/browser/components/ErrorRender/ErrorAlert.d.ts

@@ -1,12 +1,10 @@
 import type { AlertProps } from '@mui/material';
-import type { ModuleError } from '@xyo-network/payload-model';
-import React from 'react';
-export interface ErrorAlertProps extends AlertProps {
-    error?: ModuleError | Error | string;
+export interface ErrorAlertProps<T = void> extends AlertProps {
+    error?: T | Error | string;
     /** @deprecated use scope instead */
     errorContext?: string;
     onCancel?: () => void;
     scope?: string;
 }
-export declare const ErrorAlert: React.FC<ErrorAlertProps>;
+export declare function ErrorAlert<T = void>({ title, onCancel, error, errorContext, scope, ...props }: ErrorAlertProps<T>): JSX.Element;
 //# sourceMappingURL=ErrorAlert.d.ts.map

package/dist/browser/components/ErrorRender/ErrorAlert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ErrorAlert.d.ts","sourceRoot":"","sources":["../../../../src/components/ErrorRender/ErrorAlert.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAK/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,MAAM,WAAW,eAAgB,SAAQ,UAAU;IACjD,KAAK,CAAC,EAAE,WAAW,GAAG,KAAK,GAAG,MAAM,CAAA;IACpC,oCAAoC;IACpC,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA2ChD,CAAA"}
+{"version":3,"file":"ErrorAlert.d.ts","sourceRoot":"","sources":["../../../../src/components/ErrorRender/ErrorAlert.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAO/C,MAAM,WAAW,eAAe,CAAC,CAAC,GAAG,IAAI,CAAE,SAAQ,UAAU;IAC3D,KAAK,CAAC,EAAE,CAAC,GAAG,KAAK,GAAG,MAAM,CAAA;IAC1B,oCAAoC;IACpC,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,wBAAgB,UAAU,CAAC,CAAC,GAAG,IAAI,EAAE,EACnC,KAAsC,EACtC,QAAQ,EACR,KAAmC,EACnC,YAAY,EACZ,KAAK,EACL,GAAG,KAAK,EACT,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,OAAO,CAoClC"}

package/dist/browser/components/ErrorRender/Props.d.ts

@@ -1,10 +1,10 @@
 import type { FlexBoxProps } from '@xylabs/react-flexbox';
-import type { ModuleError } from '@xyo-network/payload-model';
 import type { ReactNode } from 'react';
 import type { Location } from 'react-router-dom';
-export interface ErrorRenderProps extends FlexBoxProps {
+export type ErrorEx<T = void> = T extends void ? Error : T | Error;
+export interface ErrorRenderProps<T = void> extends FlexBoxProps {
     customError?: ReactNode;
-    error?: ModuleError | Error;
+    error?: ErrorEx<T>;
     errorContext?: string;
     noErrorDisplay?: boolean;
     noReAuth?: boolean;

package/dist/browser/components/ErrorRender/Props.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Props.d.ts","sourceRoot":"","sources":["../../../../src/components/ErrorRender/Props.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAEhD,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IACpD,WAAW,CAAC,EAAE,SAAS,CAAA;IACvB,KAAK,CAAC,EAAE,WAAW,GAAG,KAAK,CAAA;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,MAAM,QAAQ,CAAA;CAC7B"}
+{"version":3,"file":"Props.d.ts","sourceRoot":"","sources":["../../../../src/components/ErrorRender/Props.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAEhD,MAAM,MAAM,OAAO,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,SAAS,IAAI,GAAG,KAAK,GAAG,CAAC,GAAG,KAAK,CAAA;AAElE,MAAM,WAAW,gBAAgB,CAAC,CAAC,GAAG,IAAI,CAAE,SAAQ,YAAY;IAC9D,WAAW,CAAC,EAAE,SAAS,CAAA;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;IAClB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,MAAM,QAAQ,CAAA;CAC7B"}

package/dist/browser/components/ErrorRender/Render.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import type { ErrorRenderProps } from './Props.ts';
-export declare const ErrorRender: React.FC<ErrorRenderProps>;
+export declare function ErrorRender<T = void>({ onCancel, error, noErrorDisplay, customError, children, errorContext, scope, useLocation, ...props }: ErrorRenderProps<T>): JSX.Element;
 //# sourceMappingURL=Render.d.ts.map

package/dist/browser/components/ErrorRender/Render.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Render.d.ts","sourceRoot":"","sources":["../../../../src/components/ErrorRender/Render.tsx"],"names":[],"mappings":"AACA,OAAO,KAAoB,MAAM,OAAO,CAAA;AAGxC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAElD,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAsClD,CAAA"}
+{"version":3,"file":"Render.d.ts","sourceRoot":"","sources":["../../../../src/components/ErrorRender/Render.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAElD,wBAAgB,WAAW,CAAC,CAAC,GAAG,IAAI,EAAE,EACpC,QAAQ,EACR,KAAK,EACL,cAAsB,EACtB,WAAkB,EAClB,QAAQ,EACR,YAAY,EACZ,KAAK,EACL,WAAW,EACX,GAAG,KAAK,EACT,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,OAAO,CA4BnC"}

package/dist/browser/contexts/ErrorReporter/Context.d.ts

@@ -1,3 +1,4 @@
 import type { ErrorReporterContextState } from './State.ts';
+/** @deprecated use from @xylabs/react-error instead */
 export declare const ErrorReporterContext: import("react").Context<ErrorReporterContextState>;
 //# sourceMappingURL=Context.d.ts.map

package/dist/browser/contexts/ErrorReporter/Context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../../../src/contexts/ErrorReporter/Context.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAA;AAE3D,eAAO,MAAM,oBAAoB,oDAA+C,CAAA"}
+{"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../../../src/contexts/ErrorReporter/Context.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAA;AAE3D,uDAAuD;AACvD,eAAO,MAAM,oBAAoB,oDAA+C,CAAA"}

package/dist/browser/contexts/ErrorReporter/Provider.d.ts

@@ -1,9 +1,10 @@
-import type { WithChildren } from '@xylabs/react-shared';
+import type { PropsWithChildren } from 'react';
 import React from 'react';
 import type Rollbar from 'rollbar';
+/** @deprecated use from @xylabs/react-error instead */
 export interface ErrorReporterProviderProps {
     rollbar: Rollbar;
 }
-declare const ErrorReporterProvider: React.FC<WithChildren<ErrorReporterProviderProps>>;
-export { ErrorReporterProvider };
+/** @deprecated use from @xylabs/react-error instead */
+export declare const ErrorReporterProvider: React.FC<PropsWithChildren<ErrorReporterProviderProps>>;
 //# sourceMappingURL=Provider.d.ts.map

package/dist/browser/contexts/ErrorReporter/Provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Provider.d.ts","sourceRoot":"","sources":["../../../../src/contexts/ErrorReporter/Provider.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACxD,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAIlC,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,OAAO,CAAA;CACjB;AAED,QAAA,MAAM,qBAAqB,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,0BAA0B,CAAC,CAe7E,CAAA;AAED,OAAO,EAAE,qBAAqB,EAAE,CAAA"}
+{"version":3,"file":"Provider.d.ts","sourceRoot":"","sources":["../../../../src/contexts/ErrorReporter/Provider.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAA;AAC9C,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAIlC,uDAAuD;AACvD,MAAM,WAAW,0BAA0B;IACzC,OAAO,EAAE,OAAO,CAAA;CACjB;AACD,uDAAuD;AACvD,eAAO,MAAM,qBAAqB,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAAC,0BAA0B,CAAC,CAezF,CAAA"}

package/dist/browser/contexts/ErrorReporter/State.d.ts

@@ -1,4 +1,5 @@
 import type Rollbar from 'rollbar';
+/** @deprecated use from @xylabs/react-error instead */
 export interface ErrorReporterContextState {
     rollbar?: Rollbar;
 }

package/dist/browser/contexts/ErrorReporter/State.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"State.d.ts","sourceRoot":"","sources":["../../../../src/contexts/ErrorReporter/State.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAElC,MAAM,WAAW,yBAAyB;IACxC,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB"}
+{"version":3,"file":"State.d.ts","sourceRoot":"","sources":["../../../../src/contexts/ErrorReporter/State.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAElC,uDAAuD;AACvD,MAAM,WAAW,yBAAyB;IACxC,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB"}

package/dist/browser/contexts/ErrorReporter/useErrorReporter.d.ts

@@ -1,2 +1,3 @@
+/** @deprecated use from @xylabs/react-error instead */
 export declare const useErrorReporter: () => import("./State.ts").ErrorReporterContextState;
 //# sourceMappingURL=useErrorReporter.d.ts.map

package/dist/browser/contexts/ErrorReporter/useErrorReporter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useErrorReporter.d.ts","sourceRoot":"","sources":["../../../../src/contexts/ErrorReporter/useErrorReporter.tsx"],"names":[],"mappings":"AAIA,eAAO,MAAM,gBAAgB,sDAO5B,CAAA"}
+{"version":3,"file":"useErrorReporter.d.ts","sourceRoot":"","sources":["../../../../src/contexts/ErrorReporter/useErrorReporter.tsx"],"names":[],"mappings":"AAIA,uDAAuD;AACvD,eAAO,MAAM,gBAAgB,sDAO5B,CAAA"}

package/dist/browser/index.mjs

@@ -41,52 +41,18 @@ var ErrorBoundary = class extends Component {
 };
 
 // src/components/ErrorBoundary/ThrownErrorBoundary.tsx
-import { useRollbar as useRollbar2 } from "@rollbar/react";
-import { ModuleErrorSchema } from "@xyo-network/payload-model";
-import React5, { Component as Component2 } from "react";
-
-// src/contexts/ErrorReporter/Provider.tsx
-import { useRollbar } from "@rollbar/react";
+import { ThrownErrorBoundary as ThrownErrorBoundaryBase } from "@xylabs/react-error";
 import React2 from "react";
-
-// src/contexts/ErrorReporter/Context.ts
-import { createContext } from "react";
-var ErrorReporterContext = createContext({});
-
-// src/contexts/ErrorReporter/Provider.tsx
-var ErrorReporterProvider = /* @__PURE__ */ __name(({ children, rollbar: rollbarProp }) => {
-  let rollbarFromHook;
-  try {
-    rollbarFromHook = useRollbar();
-  } catch {
-  }
-  const rollbar = rollbarProp ?? rollbarFromHook;
-  if (!rollbar) {
-    throw new Error("ErrorReporterProvider unable to find a Rollbar instance either passed as prop or from Provider");
-  }
-  return /* @__PURE__ */ React2.createElement(ErrorReporterContext.Provider, {
-    value: {
-      rollbar
-    }
-  }, children);
-}, "ErrorReporterProvider");
-
-// src/contexts/ErrorReporter/useErrorReporter.tsx
-import { useContext } from "react";
-var useErrorReporter = /* @__PURE__ */ __name(() => {
-  const context = useContext(ErrorReporterContext);
-  if (context === void 0) {
-    console.warn("useErrorReporter must be used within a ErrorReporterContext");
-  }
-  return context ?? {};
-}, "useErrorReporter");
+var ThrownErrorBoundary = /* @__PURE__ */ __name((props) => {
+  return /* @__PURE__ */ React2.createElement(ThrownErrorBoundaryBase, props);
+}, "ThrownErrorBoundary");
 
 // src/components/ErrorRender/ErrorAlert.tsx
 import { ExitToApp as ExitIcon } from "@mui/icons-material";
 import { Alert, AlertTitle, Typography as Typography2 } from "@mui/material";
 import { ButtonEx } from "@xylabs/react-button";
 import React3 from "react";
-var ErrorAlert = /* @__PURE__ */ __name(({ title = "Whoops! Something went wrong", onCancel, error = "An unknown error occurred", errorContext, scope, ...props }) => {
+function ErrorAlert({ title = "Whoops! Something went wrong", onCancel, error = "An unknown error occurred", errorContext, scope, ...props }) {
   const finalScope = scope ?? errorContext;
   return /* @__PURE__ */ React3.createElement(Alert, {
     severity: "error",
@@ -115,12 +81,13 @@ var ErrorAlert = /* @__PURE__ */ __name(({ title = "Whoops! Something went wrong
   }, /* @__PURE__ */ React3.createElement(ExitIcon, {
     fontSize: "small"
   })) : null);
-}, "ErrorAlert");
+}
+__name(ErrorAlert, "ErrorAlert");
 
 // src/components/ErrorRender/Render.tsx
 import { FlexCol as FlexCol2 } from "@xylabs/react-flexbox";
 import React4, { useEffect } from "react";
-var ErrorRender = /* @__PURE__ */ __name(({ onCancel, error, noErrorDisplay = false, customError = null, children, errorContext, scope, useLocation, ...props }) => {
+function ErrorRender({ onCancel, error, noErrorDisplay = false, customError = null, children, errorContext, scope, useLocation, ...props }) {
   const location = useLocation?.();
   useEffect(() => {
     if (location) {
@@ -152,67 +119,44 @@ var ErrorRender = /* @__PURE__ */ __name(({ onCancel, error, noErrorDisplay = fa
     onCancel,
     scope
   }))) : /* @__PURE__ */ React4.createElement(React4.Fragment, null, children);
-}, "ErrorRender");
+}
+__name(ErrorRender, "ErrorRender");
 
-// src/components/ErrorBoundary/ThrownErrorBoundary.tsx
-var ThrownErrorBoundaryInner = class ThrownErrorBoundaryInner2 extends Component2 {
-  static {
-    __name(this, "ThrownErrorBoundaryInner");
-  }
-  state = {
-    xyoError: void 0
-  };
-  static getDerivedStateFromError(error) {
-    return {
-      hasError: true,
-      xyoError: ThrownErrorBoundaryInner2.normalizeError(error)
-    };
-  }
-  static normalizeError(error) {
-    return error.schema === ModuleErrorSchema ? error : {
-      message: error.message,
-      schema: ModuleErrorSchema,
-      sources: []
-    };
-  }
-  componentDidCatch(error, errorInfo) {
-    const { rethrow, rollbar } = this.props;
-    const { xyoError } = this.state;
-    rollbar?.error(error);
-    console.error("Error:", xyoError, errorInfo);
-    if (rethrow) {
-      throw error;
-    }
-  }
-  render() {
-    const { xyoError } = this.state;
-    const { children, boundaryName, errorComponent, scope, title } = this.props;
-    if (xyoError) {
-      if (errorComponent) {
-        return errorComponent(xyoError);
-      }
-      return /* @__PURE__ */ React5.createElement(ErrorRender, {
-        error: xyoError,
-        errorContext: `${boundaryName} Boundary`,
-        scope,
-        title
-      });
-    }
-    return children;
-  }
-};
-var ThrownErrorBoundary = /* @__PURE__ */ __name(({ rollbar, ...props }) => {
-  const { rollbar: rollbarErrorReporter } = useErrorReporter();
+// src/contexts/ErrorReporter/Provider.tsx
+import { useRollbar } from "@rollbar/react";
+import React5 from "react";
+
+// src/contexts/ErrorReporter/Context.ts
+import { createContext } from "react";
+var ErrorReporterContext = createContext({});
+
+// src/contexts/ErrorReporter/Provider.tsx
+var ErrorReporterProvider = /* @__PURE__ */ __name(({ children, rollbar: rollbarProp }) => {
   let rollbarFromHook;
   try {
-    rollbarFromHook = useRollbar2();
+    rollbarFromHook = useRollbar();
   } catch {
   }
-  return /* @__PURE__ */ React5.createElement(ThrownErrorBoundaryInner, {
-    rollbar: rollbar ?? rollbarErrorReporter ?? rollbarFromHook,
-    ...props
-  });
-}, "ThrownErrorBoundary");
+  const rollbar = rollbarProp ?? rollbarFromHook;
+  if (!rollbar) {
+    throw new Error("ErrorReporterProvider unable to find a Rollbar instance either passed as prop or from Provider");
+  }
+  return /* @__PURE__ */ React5.createElement(ErrorReporterContext.Provider, {
+    value: {
+      rollbar
+    }
+  }, children);
+}, "ErrorReporterProvider");
+
+// src/contexts/ErrorReporter/useErrorReporter.tsx
+import { useContext } from "react";
+var useErrorReporter = /* @__PURE__ */ __name(() => {
+  const context = useContext(ErrorReporterContext);
+  if (context === void 0) {
+    console.warn("useErrorReporter must be used within a ErrorReporterContext");
+  }
+  return context ?? {};
+}, "useErrorReporter");
 export {
   ErrorAlert,
   ErrorBoundary,

package/dist/browser/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/components/ErrorBoundary.tsx","../../src/components/ErrorBoundary/ThrownErrorBoundary.tsx","../../src/contexts/ErrorReporter/Provider.tsx","../../src/contexts/ErrorReporter/Context.ts","../../src/contexts/ErrorReporter/useErrorReporter.tsx","../../src/components/ErrorRender/ErrorAlert.tsx","../../src/components/ErrorRender/Render.tsx"],"sourcesContent":["import { Typography } from '@mui/material'\nimport { FlexCol } from '@xylabs/react-flexbox'\nimport type { ErrorInfo, ReactNode } from 'react'\nimport React, { Component } from 'react'\n\nexport interface ErrorBoundaryProps {\n  children: ReactNode\n  // fallback as a static ReactNode value\n  fallback?: ReactNode\n  // fallback element that can receive the error as a prop\n  fallbackWithError?: (error: Error) => ReactNode\n  scope?: string\n}\n\nexport interface ErrorBoundaryState {\n  error?: Error\n}\n\nexport class ErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState> {\n  constructor(props: ErrorBoundaryProps) {\n    super(props)\n    this.state = { error: undefined }\n  }\n\n  static getDerivedStateFromError(error: Error) {\n    return { error }\n  }\n\n  override componentDidCatch(error: Error, errorInfo: ErrorInfo) {\n    console.error(`${error}: ${errorInfo}`)\n  }\n\n  override render() {\n    if (this.state.error) {\n      if (this.props.fallbackWithError) {\n        return this.props.fallbackWithError(this.state.error)\n      }\n      return (\n        this.props.fallback ?? (\n          <FlexCol>\n            <Typography variant=\"h1\">Something went wrong.</Typography>\n            {this.props.scope && (\n              <Typography variant=\"h2\">\n                [\n                {this.props.scope}\n                ]\n              </Typography>\n            )}\n            <Typography variant=\"body1\">\n              [\n              {this.state.error?.message}\n              ]\n            </Typography>\n          </FlexCol>\n        )\n      )\n    }\n\n    return this.props.children\n  }\n}\n","import { useRollbar } from '@rollbar/react'\nimport type { ModuleError } from '@xyo-network/payload-model'\nimport { ModuleErrorSchema } from '@xyo-network/payload-model'\nimport type {\n  ErrorInfo, FC, ReactNode,\n} from 'react'\nimport React, { Component } from 'react'\nimport type Rollbar from 'rollbar'\n\nimport { useErrorReporter } from '../../contexts/index.ts'\nimport { ErrorRender } from '../ErrorRender/index.ts'\n\nexport interface ThrownErrorBoundaryProps {\n  boundaryName?: string\n  children: ReactNode\n  errorComponent?: (e: ModuleError, boundaryName?: string) => ReactNode\n  rethrow?: boolean\n  rollbar?: Rollbar\n  scope?: string\n  title?: string\n}\n\nexport interface ThrownErrorBoundaryState {\n  xyoError?: ModuleError\n}\n\nclass ThrownErrorBoundaryInner extends Component<ThrownErrorBoundaryProps, ThrownErrorBoundaryState> {\n  override state: ThrownErrorBoundaryState = { xyoError: undefined }\n\n  static getDerivedStateFromError(error: Error) {\n    return { hasError: true, xyoError: ThrownErrorBoundaryInner.normalizeError(error) } as ThrownErrorBoundaryState\n  }\n\n  static normalizeError(error: Error | ModuleError): ModuleError {\n    return (\n      (error as ModuleError).schema === ModuleErrorSchema\n        ? error\n        : {\n            message: error.message, schema: ModuleErrorSchema, sources: [],\n          }) as ModuleError\n  }\n\n  override componentDidCatch(error: Error, errorInfo: ErrorInfo) {\n    const { rethrow, rollbar } = this.props\n    const { xyoError } = this.state\n\n    rollbar?.error(error)\n\n    console.error('Error:', xyoError, errorInfo)\n    if (rethrow) {\n      throw error\n    }\n  }\n\n  override render() {\n    const { xyoError } = this.state\n    const {\n      children, boundaryName, errorComponent, scope, title,\n    } = this.props\n    if (xyoError) {\n      if (errorComponent) {\n        return errorComponent(xyoError)\n      }\n      return <ErrorRender error={xyoError} errorContext={`${boundaryName} Boundary`} scope={scope} title={title} />\n    }\n\n    return children\n  }\n}\n\n// calling the hook outside of the component since only can be called in functional component\nexport const ThrownErrorBoundary: FC<ThrownErrorBoundaryProps> = ({ rollbar, ...props }) => {\n  const { rollbar: rollbarErrorReporter } = useErrorReporter()\n  let rollbarFromHook: Rollbar | undefined\n  // safely call the hook\n  try {\n    rollbarFromHook = useRollbar()\n  } catch {}\n  return <ThrownErrorBoundaryInner rollbar={rollbar ?? rollbarErrorReporter ?? rollbarFromHook} {...props} />\n}\n","import { useRollbar } from '@rollbar/react'\nimport type { WithChildren } from '@xylabs/react-shared'\nimport React from 'react'\nimport type Rollbar from 'rollbar'\n\nimport { ErrorReporterContext } from './Context.ts'\n\nexport interface ErrorReporterProviderProps {\n  rollbar: Rollbar\n}\n\nconst ErrorReporterProvider: React.FC<WithChildren<ErrorReporterProviderProps>> = ({ children, rollbar: rollbarProp }) => {\n  let rollbarFromHook: Rollbar | undefined\n  // safely call the hook\n  try {\n    rollbarFromHook = useRollbar()\n  } catch {}\n\n  const rollbar = rollbarProp ?? rollbarFromHook\n\n  if (!rollbar) {\n    throw new Error('ErrorReporterProvider unable to find a Rollbar instance either passed as prop or from Provider')\n  }\n\n  // eslint-disable-next-line @eslint-react/no-unstable-context-value\n  return <ErrorReporterContext.Provider value={{ rollbar }}>{children}</ErrorReporterContext.Provider>\n}\n\nexport { ErrorReporterProvider }\n","import { createContext } from 'react'\n\nimport type { ErrorReporterContextState } from './State.ts'\n\nexport const ErrorReporterContext = createContext<ErrorReporterContextState>({})\n","import { useContext } from 'react'\n\nimport { ErrorReporterContext } from './Context.ts'\n\nexport const useErrorReporter = () => {\n  const context = useContext(ErrorReporterContext)\n  if (context === undefined) {\n    console.warn('useErrorReporter must be used within a ErrorReporterContext')\n  }\n\n  return context ?? {}\n}\n","import { ExitToApp as ExitIcon } from '@mui/icons-material'\nimport type { AlertProps } from '@mui/material'\nimport {\n  Alert, AlertTitle, Typography,\n} from '@mui/material'\nimport { ButtonEx } from '@xylabs/react-button'\nimport type { ModuleError } from '@xyo-network/payload-model'\nimport React from 'react'\n\nexport interface ErrorAlertProps extends AlertProps {\n  error?: ModuleError | Error | string\n  /** @deprecated use scope instead */\n  errorContext?: string\n  onCancel?: () => void\n  scope?: string\n}\n\nexport const ErrorAlert: React.FC<ErrorAlertProps> = ({\n  title = 'Whoops! Something went wrong',\n  onCancel,\n  error = 'An unknown error occurred',\n  errorContext,\n  scope,\n  ...props\n}) => {\n  const finalScope = scope ?? errorContext\n  return (\n    <Alert severity=\"error\" {...props}>\n      <AlertTitle>{title}</AlertTitle>\n      {finalScope\n        ? (\n            <div>\n              <Typography variant=\"caption\" mr={0.5} fontWeight=\"bold\">\n                Scope:\n              </Typography>\n              <Typography variant=\"caption\">{finalScope}</Typography>\n            </div>\n          )\n        : null}\n      <div>\n        <Typography variant=\"caption\" mr={0.5} fontWeight=\"bold\">\n          Error:\n        </Typography>\n        <Typography variant=\"caption\">{typeof error === 'string' ? error : error?.message}</Typography>\n      </div>\n      {onCancel\n        ? (\n            <ButtonEx\n              variant=\"outlined\"\n              size=\"small\"\n              onClick={onCancel}\n              position=\"absolute\"\n              style={{ right: 8, top: 8 }}\n            >\n              <ExitIcon fontSize=\"small\" />\n            </ButtonEx>\n          )\n        : null}\n    </Alert>\n  )\n}\n","import { FlexCol } from '@xylabs/react-flexbox'\nimport React, { useEffect } from 'react'\n\nimport { ErrorAlert } from './ErrorAlert.tsx'\nimport type { ErrorRenderProps } from './Props.ts'\n\nexport const ErrorRender: React.FC<ErrorRenderProps> = ({\n  onCancel,\n  error,\n  noErrorDisplay = false,\n  customError = null,\n  children,\n  errorContext,\n  scope,\n  useLocation,\n  ...props\n}) => {\n  const location = useLocation?.()\n  useEffect(() => {\n    if (location) {\n      // ensure we end up at the same place we are now after logging in\n      location.state = { from: { pathname: globalThis.location.pathname } }\n    }\n  }, [location])\n\n  useEffect(() => {\n    if (error) {\n      globalThis.rollbar?.error(error)\n    }\n  }, [error])\n\n  return error\n    ? (\n        <FlexCol alignItems=\"stretch\" {...props}>\n          {noErrorDisplay\n            ? customError\n            : (\n                <FlexCol alignItems=\"center\" {...props}>\n                  <ErrorAlert error={error} errorContext={errorContext} onCancel={onCancel} scope={scope} />\n                </FlexCol>\n              )}\n        </FlexCol>\n      )\n    : <>{children}</>\n}\n"],"mappings":"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","names":["Typography","FlexCol","React","Component","ErrorBoundary","Component","constructor","props","state","error","undefined","getDerivedStateFromError","componentDidCatch","errorInfo","console","render","fallbackWithError","fallback","FlexCol","Typography","variant","scope","message","children","useRollbar","ModuleErrorSchema","React","Component","useRollbar","React","createContext","ErrorReporterContext","ErrorReporterProvider","children","rollbar","rollbarProp","rollbarFromHook","useRollbar","Error","React","ErrorReporterContext","Provider","value","useContext","useErrorReporter","context","useContext","ErrorReporterContext","undefined","console","warn","ExitToApp","ExitIcon","Alert","AlertTitle","Typography","ButtonEx","React","ErrorAlert","title","onCancel","error","errorContext","scope","props","finalScope","React","Alert","severity","AlertTitle","div","Typography","variant","mr","fontWeight","message","ButtonEx","size","onClick","position","style","right","top","ExitIcon","fontSize","FlexCol","React","useEffect","ErrorRender","onCancel","error","noErrorDisplay","customError","children","errorContext","scope","useLocation","props","location","useEffect","state","from","pathname","globalThis","rollbar","React","FlexCol","alignItems","ErrorAlert","ThrownErrorBoundaryInner","Component","state","xyoError","undefined","getDerivedStateFromError","error","hasError","normalizeError","schema","ModuleErrorSchema","message","sources","componentDidCatch","errorInfo","rethrow","rollbar","props","console","render","children","boundaryName","errorComponent","scope","title","React","ErrorRender","errorContext","ThrownErrorBoundary","rollbarErrorReporter","useErrorReporter","rollbarFromHook","useRollbar"]}
+{"version":3,"sources":["../../src/components/ErrorBoundary.tsx","../../src/components/ErrorBoundary/ThrownErrorBoundary.tsx","../../src/components/ErrorRender/ErrorAlert.tsx","../../src/components/ErrorRender/Render.tsx","../../src/contexts/ErrorReporter/Provider.tsx","../../src/contexts/ErrorReporter/Context.ts","../../src/contexts/ErrorReporter/useErrorReporter.tsx"],"sourcesContent":["import { Typography } from '@mui/material'\nimport { FlexCol } from '@xylabs/react-flexbox'\nimport type { ErrorInfo, ReactNode } from 'react'\nimport React, { Component } from 'react'\n\n/** @deprecated use from @xylabs/react-error instead */\nexport interface ErrorBoundaryProps {\n  children: ReactNode\n  // fallback as a static ReactNode value\n  fallback?: ReactNode\n  // fallback element that can receive the error as a prop\n  fallbackWithError?: (error: Error) => ReactNode\n  scope?: string\n}\n\n/** @deprecated use from @xylabs/react-error instead */\nexport interface ErrorBoundaryState {\n  error?: Error\n}\n\n/** @deprecated use from @xylabs/react-error instead */\nexport class ErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState> {\n  constructor(props: ErrorBoundaryProps) {\n    super(props)\n    this.state = { error: undefined }\n  }\n\n  static getDerivedStateFromError(error: Error) {\n    return { error }\n  }\n\n  override componentDidCatch(error: Error, errorInfo: ErrorInfo) {\n    console.error(`${error}: ${errorInfo}`)\n  }\n\n  override render() {\n    if (this.state.error) {\n      if (this.props.fallbackWithError) {\n        return this.props.fallbackWithError(this.state.error)\n      }\n      return (\n        this.props.fallback ?? (\n          <FlexCol>\n            <Typography variant=\"h1\">Something went wrong.</Typography>\n            {this.props.scope && (\n              <Typography variant=\"h2\">\n                [\n                {this.props.scope}\n                ]\n              </Typography>\n            )}\n            <Typography variant=\"body1\">\n              [\n              {this.state.error?.message}\n              ]\n            </Typography>\n          </FlexCol>\n        )\n      )\n    }\n\n    return this.props.children\n  }\n}\n","import type { ThrownErrorBoundaryProps } from '@xylabs/react-error'\nimport { ThrownErrorBoundary as ThrownErrorBoundaryBase } from '@xylabs/react-error'\nimport type { ModuleError } from '@xyo-network/payload-model'\nimport type { FC } from 'react'\nimport React from 'react'\n\n// calling the hook outside of the component since only can be called in functional component\nexport const ThrownErrorBoundary: FC<ThrownErrorBoundaryProps<ModuleError>> = (props) => {\n  return <ThrownErrorBoundaryBase<ModuleError> {...props} />\n}\n","import { ExitToApp as ExitIcon } from '@mui/icons-material'\nimport type { AlertProps } from '@mui/material'\nimport {\n  Alert, AlertTitle, Typography,\n} from '@mui/material'\nimport { ButtonEx } from '@xylabs/react-button'\nimport React from 'react'\n\nexport interface ErrorAlertProps<T = void> extends AlertProps {\n  error?: T | Error | string\n  /** @deprecated use scope instead */\n  errorContext?: string\n  onCancel?: () => void\n  scope?: string\n}\n\nexport function ErrorAlert<T = void>({\n  title = 'Whoops! Something went wrong',\n  onCancel,\n  error = 'An unknown error occurred',\n  errorContext,\n  scope,\n  ...props\n}: ErrorAlertProps<T>): JSX.Element {\n  const finalScope = scope ?? errorContext\n  return (\n    <Alert severity=\"error\" {...props}>\n      <AlertTitle>{title}</AlertTitle>\n      {finalScope\n        ? (\n            <div>\n              <Typography variant=\"caption\" mr={0.5} fontWeight=\"bold\">\n                Scope:\n              </Typography>\n              <Typography variant=\"caption\">{finalScope}</Typography>\n            </div>\n          )\n        : null}\n      <div>\n        <Typography variant=\"caption\" mr={0.5} fontWeight=\"bold\">\n          Error:\n        </Typography>\n        <Typography variant=\"caption\">{typeof error === 'string' ? error : (error as Error)?.message}</Typography>\n      </div>\n      {onCancel\n        ? (\n            <ButtonEx\n              variant=\"outlined\"\n              size=\"small\"\n              onClick={onCancel}\n              position=\"absolute\"\n              style={{ right: 8, top: 8 }}\n            >\n              <ExitIcon fontSize=\"small\" />\n            </ButtonEx>\n          )\n        : null}\n    </Alert>\n  )\n}\n","import { FlexCol } from '@xylabs/react-flexbox'\nimport React, { useEffect } from 'react'\n\nimport { ErrorAlert } from './ErrorAlert.tsx'\nimport type { ErrorRenderProps } from './Props.ts'\n\nexport function ErrorRender<T = void>({\n  onCancel,\n  error,\n  noErrorDisplay = false,\n  customError = null,\n  children,\n  errorContext,\n  scope,\n  useLocation,\n  ...props\n}: ErrorRenderProps<T>): JSX.Element {\n  const location = useLocation?.()\n  useEffect(() => {\n    if (location) {\n      // ensure we end up at the same place we are now after logging in\n      location.state = { from: { pathname: globalThis.location.pathname } }\n    }\n  }, [location])\n\n  useEffect(() => {\n    if (error) {\n      globalThis.rollbar?.error(error)\n    }\n  }, [error])\n\n  return error\n    ? (\n        <FlexCol alignItems=\"stretch\" {...props}>\n          {noErrorDisplay\n            ? customError\n            : (\n                <FlexCol alignItems=\"center\" {...props}>\n                  <ErrorAlert error={error} errorContext={errorContext} onCancel={onCancel} scope={scope} />\n                </FlexCol>\n              )}\n        </FlexCol>\n      )\n    : <>{children}</>\n}\n","import { useRollbar } from '@rollbar/react'\nimport type { PropsWithChildren } from 'react'\nimport React from 'react'\nimport type Rollbar from 'rollbar'\n\nimport { ErrorReporterContext } from './Context.ts'\n\n/** @deprecated use from @xylabs/react-error instead */\nexport interface ErrorReporterProviderProps {\n  rollbar: Rollbar\n}\n/** @deprecated use from @xylabs/react-error instead */\nexport const ErrorReporterProvider: React.FC<PropsWithChildren<ErrorReporterProviderProps>> = ({ children, rollbar: rollbarProp }) => {\n  let rollbarFromHook: Rollbar | undefined\n  // safely call the hook\n  try {\n    rollbarFromHook = useRollbar()\n  } catch {}\n\n  const rollbar = rollbarProp ?? rollbarFromHook\n\n  if (!rollbar) {\n    throw new Error('ErrorReporterProvider unable to find a Rollbar instance either passed as prop or from Provider')\n  }\n\n  // eslint-disable-next-line @eslint-react/no-unstable-context-value\n  return <ErrorReporterContext.Provider value={{ rollbar }}>{children}</ErrorReporterContext.Provider>\n}\n","import { createContext } from 'react'\n\nimport type { ErrorReporterContextState } from './State.ts'\n\n/** @deprecated use from @xylabs/react-error instead */\nexport const ErrorReporterContext = createContext<ErrorReporterContextState>({})\n","import { useContext } from 'react'\n\nimport { ErrorReporterContext } from './Context.ts'\n\n/** @deprecated use from @xylabs/react-error instead */\nexport const useErrorReporter = () => {\n  const context = useContext(ErrorReporterContext)\n  if (context === undefined) {\n    console.warn('useErrorReporter must be used within a ErrorReporterContext')\n  }\n\n  return context ?? {}\n}\n"],"mappings":"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","names":["Typography","FlexCol","React","Component","ErrorBoundary","Component","constructor","props","state","error","undefined","getDerivedStateFromError","componentDidCatch","errorInfo","console","render","fallbackWithError","fallback","FlexCol","Typography","variant","scope","message","children","ThrownErrorBoundary","ThrownErrorBoundaryBase","React","ThrownErrorBoundary","props","React","ThrownErrorBoundaryBase","ExitToApp","ExitIcon","Alert","AlertTitle","Typography","ButtonEx","React","ErrorAlert","title","onCancel","error","errorContext","scope","props","finalScope","React","Alert","severity","AlertTitle","div","Typography","variant","mr","fontWeight","message","ButtonEx","size","onClick","position","style","right","top","ExitIcon","fontSize","FlexCol","React","useEffect","ErrorRender","onCancel","error","noErrorDisplay","customError","children","errorContext","scope","useLocation","props","location","useEffect","state","from","pathname","globalThis","rollbar","React","FlexCol","alignItems","ErrorAlert","useRollbar","React","createContext","ErrorReporterContext","ErrorReporterProvider","children","rollbar","rollbarProp","rollbarFromHook","useRollbar","Error","React","ErrorReporterContext","Provider","value","useContext","useErrorReporter","context","useContext","ErrorReporterContext","undefined","console","warn"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/react-error",
-  "version": "4.1.7",
+  "version": "4.1.9",
   "description": "Common React library for all XYO projects that use React",
   "keywords": [
     "xyo",
@@ -44,10 +44,10 @@
   },
   "dependencies": {
     "@rollbar/react": "^0.12.0-beta",
-    "@xylabs/react-button": "^5.2.2",
-    "@xylabs/react-flexbox": "^5.2.2",
-    "@xylabs/react-shared": "^5.2.2",
-    "@xyo-network/payload-model": "^3.3.0",
+    "@xylabs/react-button": "^5.2.7",
+    "@xylabs/react-error": "^5.2.7",
+    "@xylabs/react-flexbox": "^5.2.7",
+    "@xyo-network/payload-model": "^3.3.2",
     "prop-types": "^15.8.1",
     "react-router-dom": "^6.27.0"
   },

package/src/components/ErrorBoundary/ThrownErrorBoundary.tsx

@@ -1,80 +1,10 @@
-import { useRollbar } from '@rollbar/react'
+import type { ThrownErrorBoundaryProps } from '@xylabs/react-error'
+import { ThrownErrorBoundary as ThrownErrorBoundaryBase } from '@xylabs/react-error'
 import type { ModuleError } from '@xyo-network/payload-model'
-import { ModuleErrorSchema } from '@xyo-network/payload-model'
-import type {
-  ErrorInfo, FC, ReactNode,
-} from 'react'
-import React, { Component } from 'react'
-import type Rollbar from 'rollbar'
-
-import { useErrorReporter } from '../../contexts/index.ts'
-import { ErrorRender } from '../ErrorRender/index.ts'
-
-export interface ThrownErrorBoundaryProps {
-  boundaryName?: string
-  children: ReactNode
-  errorComponent?: (e: ModuleError, boundaryName?: string) => ReactNode
-  rethrow?: boolean
-  rollbar?: Rollbar
-  scope?: string
-  title?: string
-}
-
-export interface ThrownErrorBoundaryState {
-  xyoError?: ModuleError
-}
-
-class ThrownErrorBoundaryInner extends Component<ThrownErrorBoundaryProps, ThrownErrorBoundaryState> {
-  override state: ThrownErrorBoundaryState = { xyoError: undefined }
-
-  static getDerivedStateFromError(error: Error) {
-    return { hasError: true, xyoError: ThrownErrorBoundaryInner.normalizeError(error) } as ThrownErrorBoundaryState
-  }
-
-  static normalizeError(error: Error | ModuleError): ModuleError {
-    return (
-      (error as ModuleError).schema === ModuleErrorSchema
-        ? error
-        : {
-            message: error.message, schema: ModuleErrorSchema, sources: [],
-          }) as ModuleError
-  }
-
-  override componentDidCatch(error: Error, errorInfo: ErrorInfo) {
-    const { rethrow, rollbar } = this.props
-    const { xyoError } = this.state
-
-    rollbar?.error(error)
-
-    console.error('Error:', xyoError, errorInfo)
-    if (rethrow) {
-      throw error
-    }
-  }
-
-  override render() {
-    const { xyoError } = this.state
-    const {
-      children, boundaryName, errorComponent, scope, title,
-    } = this.props
-    if (xyoError) {
-      if (errorComponent) {
-        return errorComponent(xyoError)
-      }
-      return <ErrorRender error={xyoError} errorContext={`${boundaryName} Boundary`} scope={scope} title={title} />
-    }
-
-    return children
-  }
-}
+import type { FC } from 'react'
+import React from 'react'
 
 // calling the hook outside of the component since only can be called in functional component
-export const ThrownErrorBoundary: FC<ThrownErrorBoundaryProps> = ({ rollbar, ...props }) => {
-  const { rollbar: rollbarErrorReporter } = useErrorReporter()
-  let rollbarFromHook: Rollbar | undefined
-  // safely call the hook
-  try {
-    rollbarFromHook = useRollbar()
-  } catch {}
-  return <ThrownErrorBoundaryInner rollbar={rollbar ?? rollbarErrorReporter ?? rollbarFromHook} {...props} />
+export const ThrownErrorBoundary: FC<ThrownErrorBoundaryProps<ModuleError>> = (props) => {
+  return <ThrownErrorBoundaryBase<ModuleError> {...props} />
 }

package/src/components/ErrorBoundary/ThrownErrorBoundaryBase.tsx

@@ -0,0 +1,77 @@
+import { useRollbar } from '@rollbar/react'
+import type { ErrorInfo, ReactNode } from 'react'
+import React, { Component } from 'react'
+import type Rollbar from 'rollbar'
+
+import { useErrorReporter } from '../../contexts/index.ts'
+import { ErrorRender } from '../ErrorRender/index.ts'
+
+/** @deprecated use from @xylabs/react-error instead */
+export type ErrorEx<T = void> = T extends void ? Error : T | Error
+
+/** @deprecated use from @xylabs/react-error instead */
+export interface ThrownErrorBoundaryProps<T = void> {
+  boundaryName?: string
+  children: ReactNode
+  errorComponent?: (e: ErrorEx<T>, boundaryName?: string) => ReactNode
+  rethrow?: boolean
+  rollbar?: Rollbar
+  scope?: string
+  title?: string
+}
+
+/** @deprecated use from @xylabs/react-error instead */
+export interface ThrownErrorBoundaryState<T = void> {
+  errorEx?: ErrorEx<T>
+}
+
+class ThrownErrorBoundaryInner<T> extends Component<ThrownErrorBoundaryProps<T>, ThrownErrorBoundaryState<T>> {
+  override state: ThrownErrorBoundaryState<T> = { errorEx: undefined }
+
+  static getDerivedStateFromError<T = void>(error: ErrorEx<T>) {
+    return { hasError: true, xyoError: this.normalizeError<T>(error) } as ThrownErrorBoundaryState<T>
+  }
+
+  static normalizeError<T>(_error: ErrorEx<T>): T {
+    throw new Error('Method not implemented.')
+  }
+
+  override componentDidCatch(error: Error, errorInfo: ErrorInfo) {
+    const { rethrow, rollbar } = this.props
+    const { errorEx } = this.state
+
+    rollbar?.error(error)
+
+    console.error('Error:', errorEx, errorInfo)
+    if (rethrow) {
+      throw error
+    }
+  }
+
+  override render() {
+    const { errorEx } = this.state
+    const {
+      children, boundaryName, errorComponent, scope, title,
+    } = this.props
+    if (errorEx) {
+      if (errorComponent) {
+        return errorComponent(errorEx)
+      }
+      return <ErrorRender<T> error={errorEx} errorContext={`${boundaryName} Boundary`} scope={scope} title={title} />
+    }
+
+    return children
+  }
+}
+
+// calling the hook outside of the component since only can be called in functional component
+/** @deprecated use from @xylabs/react-error instead */
+export function ThrownErrorBoundaryBase<T = void>({ rollbar, ...props }: ThrownErrorBoundaryProps<T>): JSX.Element {
+  const { rollbar: rollbarErrorReporter } = useErrorReporter()
+  let rollbarFromHook: Rollbar | undefined
+  // safely call the hook
+  try {
+    rollbarFromHook = useRollbar()
+  } catch {}
+  return <ThrownErrorBoundaryInner<T> rollbar={rollbar ?? rollbarErrorReporter ?? rollbarFromHook} {...props} />
+}

package/src/components/ErrorBoundary.tsx

@@ -3,6 +3,7 @@ import { FlexCol } from '@xylabs/react-flexbox'
 import type { ErrorInfo, ReactNode } from 'react'
 import React, { Component } from 'react'
 
+/** @deprecated use from @xylabs/react-error instead */
 export interface ErrorBoundaryProps {
   children: ReactNode
   // fallback as a static ReactNode value
@@ -12,10 +13,12 @@ export interface ErrorBoundaryProps {
   scope?: string
 }
 
+/** @deprecated use from @xylabs/react-error instead */
 export interface ErrorBoundaryState {
   error?: Error
 }
 
+/** @deprecated use from @xylabs/react-error instead */
 export class ErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState> {
   constructor(props: ErrorBoundaryProps) {
     super(props)

package/src/components/ErrorRender/ErrorAlert.tsx

@@ -4,25 +4,24 @@ import {
   Alert, AlertTitle, Typography,
 } from '@mui/material'
 import { ButtonEx } from '@xylabs/react-button'
-import type { ModuleError } from '@xyo-network/payload-model'
 import React from 'react'
 
-export interface ErrorAlertProps extends AlertProps {
-  error?: ModuleError | Error | string
+export interface ErrorAlertProps<T = void> extends AlertProps {
+  error?: T | Error | string
   /** @deprecated use scope instead */
   errorContext?: string
   onCancel?: () => void
   scope?: string
 }
 
-export const ErrorAlert: React.FC<ErrorAlertProps> = ({
+export function ErrorAlert<T = void>({
   title = 'Whoops! Something went wrong',
   onCancel,
   error = 'An unknown error occurred',
   errorContext,
   scope,
   ...props
-}) => {
+}: ErrorAlertProps<T>): JSX.Element {
   const finalScope = scope ?? errorContext
   return (
     <Alert severity="error" {...props}>
@@ -41,7 +40,7 @@ export const ErrorAlert: React.FC<ErrorAlertProps> = ({
         <Typography variant="caption" mr={0.5} fontWeight="bold">
           Error:
         </Typography>
-        <Typography variant="caption">{typeof error === 'string' ? error : error?.message}</Typography>
+        <Typography variant="caption">{typeof error === 'string' ? error : (error as Error)?.message}</Typography>
       </div>
       {onCancel
         ? (

package/src/components/ErrorRender/Props.ts

@@ -1,11 +1,12 @@
 import type { FlexBoxProps } from '@xylabs/react-flexbox'
-import type { ModuleError } from '@xyo-network/payload-model'
 import type { ReactNode } from 'react'
 import type { Location } from 'react-router-dom'
 
-export interface ErrorRenderProps extends FlexBoxProps {
+export type ErrorEx<T = void> = T extends void ? Error : T | Error
+
+export interface ErrorRenderProps<T = void> extends FlexBoxProps {
   customError?: ReactNode
-  error?: ModuleError | Error
+  error?: ErrorEx<T>
   errorContext?: string
   noErrorDisplay?: boolean
   noReAuth?: boolean

package/src/components/ErrorRender/Render.tsx

@@ -4,7 +4,7 @@ import React, { useEffect } from 'react'
 import { ErrorAlert } from './ErrorAlert.tsx'
 import type { ErrorRenderProps } from './Props.ts'
 
-export const ErrorRender: React.FC<ErrorRenderProps> = ({
+export function ErrorRender<T = void>({
   onCancel,
   error,
   noErrorDisplay = false,
@@ -14,7 +14,7 @@ export const ErrorRender: React.FC<ErrorRenderProps> = ({
   scope,
   useLocation,
   ...props
-}) => {
+}: ErrorRenderProps<T>): JSX.Element {
   const location = useLocation?.()
   useEffect(() => {
     if (location) {

package/src/contexts/ErrorReporter/Context.ts

@@ -2,4 +2,5 @@ import { createContext } from 'react'
 
 import type { ErrorReporterContextState } from './State.ts'
 
+/** @deprecated use from @xylabs/react-error instead */
 export const ErrorReporterContext = createContext<ErrorReporterContextState>({})

package/src/contexts/ErrorReporter/Provider.tsx

@@ -1,15 +1,16 @@
 import { useRollbar } from '@rollbar/react'
-import type { WithChildren } from '@xylabs/react-shared'
+import type { PropsWithChildren } from 'react'
 import React from 'react'
 import type Rollbar from 'rollbar'
 
 import { ErrorReporterContext } from './Context.ts'
 
+/** @deprecated use from @xylabs/react-error instead */
 export interface ErrorReporterProviderProps {
   rollbar: Rollbar
 }
-
-const ErrorReporterProvider: React.FC<WithChildren<ErrorReporterProviderProps>> = ({ children, rollbar: rollbarProp }) => {
+/** @deprecated use from @xylabs/react-error instead */
+export const ErrorReporterProvider: React.FC<PropsWithChildren<ErrorReporterProviderProps>> = ({ children, rollbar: rollbarProp }) => {
   let rollbarFromHook: Rollbar | undefined
   // safely call the hook
   try {
@@ -25,5 +26,3 @@ const ErrorReporterProvider: React.FC<WithChildren<ErrorReporterProviderProps>>
   // eslint-disable-next-line @eslint-react/no-unstable-context-value
   return <ErrorReporterContext.Provider value={{ rollbar }}>{children}</ErrorReporterContext.Provider>
 }
-
-export { ErrorReporterProvider }

package/src/contexts/ErrorReporter/State.ts

@@ -1,5 +1,6 @@
 import type Rollbar from 'rollbar'
 
+/** @deprecated use from @xylabs/react-error instead */
 export interface ErrorReporterContextState {
   rollbar?: Rollbar
 }

package/src/contexts/ErrorReporter/useErrorReporter.tsx

@@ -2,6 +2,7 @@ import { useContext } from 'react'
 
 import { ErrorReporterContext } from './Context.ts'
 
+/** @deprecated use from @xylabs/react-error instead */
 export const useErrorReporter = () => {
   const context = useContext(ErrorReporterContext)
   if (context === undefined) {