@flareapp/react 2.4.0 → 2.5.1

package/dist/flareReactErrorHandler-FqJ6hQZc.mjs

@@ -0,0 +1,233 @@
+import * as React from "react";
+import { Component, version } from "react";
+import { convertToError } from "@flareapp/core";
+
+//#region src/constants.ts
+const CHROMIUM_STACK_REGEX = /^at\s+(\S+)(?:\s+\((.+):(\d+):(\d+)\))?$/;
+const FIREFOX_SAFARI_STACK_REGEX = /^(\S+?)@(.+):(\d+):(\d+)$/;
+const PACKAGE_VERSION = typeof process !== "undefined" && true ? "2.5.1" : "?";
+
+//#endregion
+//#region src/identify.ts
+const sdkTagged = /* @__PURE__ */ new WeakSet();
+const frameworkTagged = /* @__PURE__ */ new WeakSet();
+function registerReactSdkIdentity(flare) {
+	if (!sdkTagged.has(flare)) {
+		sdkTagged.add(flare);
+		flare.setSdkInfo({
+			name: "@flareapp/react",
+			version: PACKAGE_VERSION
+		});
+	}
+	tagReactFramework(flare);
+}
+function tagReactFramework(flare) {
+	if (frameworkTagged.has(flare)) return;
+	frameworkTagged.add(flare);
+	flare.setFramework({
+		name: "React",
+		version: React.version
+	});
+}
+
+//#endregion
+//#region src/resolveFlare.ts
+let defaultProvider = null;
+function isDevMode() {
+	try {
+		return process.env.NODE_ENV !== "production";
+	} catch {
+		return false;
+	}
+}
+function registerDefaultFlare(provider) {
+	if (typeof window !== "undefined" && window.__flare) {
+		const message = "[flare] @flareapp/react (web root) was imported in a renderer where the Electron bridge is present, pulling the keyed @flareapp/js singleton into the renderer. Import @flareapp/react/inject and pass the @flareapp/electron/renderer instance instead.";
+		if (isDevMode()) throw new Error(message);
+		console.warn(message);
+	}
+	defaultProvider = provider;
+}
+function resolveFlare(explicit) {
+	if (explicit) return explicit;
+	if (defaultProvider) return defaultProvider();
+	throw new Error("[flare] No Flare instance available. Pass `flare` (e.g. from @flareapp/electron/renderer), or import @flareapp/react (the package root) to use the @flareapp/js default singleton.");
+}
+
+//#endregion
+//#region src/formatComponentStack.ts
+function formatComponentStack(stack) {
+	return stack.split(/\s*\n\s*/g).filter((line) => line.length > 0);
+}
+
+//#endregion
+//#region src/parseComponentStack.ts
+function parseComponentStack(stack) {
+	return stack.split(/\s*\n\s*/g).filter((line) => line.length > 0).map((line) => {
+		const chromeMatch = line.match(CHROMIUM_STACK_REGEX);
+		if (chromeMatch) return {
+			component: chromeMatch[1],
+			file: chromeMatch[2] ?? null,
+			line: chromeMatch[3] ? Number(chromeMatch[3]) : null,
+			column: chromeMatch[4] ? Number(chromeMatch[4]) : null
+		};
+		const firefoxSafariMatch = line.match(FIREFOX_SAFARI_STACK_REGEX);
+		if (firefoxSafariMatch) return {
+			component: firefoxSafariMatch[1],
+			file: firefoxSafariMatch[2],
+			line: Number(firefoxSafariMatch[3]),
+			column: Number(firefoxSafariMatch[4])
+		};
+		return {
+			component: line.replace(/^at\s+/, ""),
+			file: null,
+			line: null,
+			column: null
+		};
+	});
+}
+
+//#endregion
+//#region src/parseMinifiedReactError.ts
+const NUMBER_PATTERN = /Minified React error #(\d+)/;
+const ARG_PATTERN = /args\[\]=([^&\s]*)/g;
+const URL_PATTERN = /(https?:\/\/\S+)/;
+function safeDecode(value) {
+	try {
+		return decodeURIComponent(value);
+	} catch {
+		return value;
+	}
+}
+function parseMinifiedReactError(error) {
+	const message = error?.message;
+	if (!message) return null;
+	const numberMatch = message.match(NUMBER_PATTERN);
+	if (!numberMatch) return null;
+	const args = [];
+	for (const match of message.matchAll(ARG_PATTERN)) args.push(safeDecode(match[1]));
+	const urlMatch = message.match(URL_PATTERN);
+	return {
+		number: Number(numberMatch[1]),
+		args,
+		url: urlMatch ? urlMatch[1] : null
+	};
+}
+
+//#endregion
+//#region src/buildReactContext.ts
+function buildReactContext(rawStack, error) {
+	const minifiedError = parseMinifiedReactError(error);
+	return { react: {
+		componentStack: formatComponentStack(rawStack),
+		componentStackFrames: parseComponentStack(rawStack),
+		version,
+		...minifiedError ? { minifiedError } : {}
+	} };
+}
+
+//#endregion
+//#region src/contextToAttributes.ts
+function contextToAttributes(context) {
+	return { "context.custom": { react: {
+		componentStack: context.react.componentStack,
+		componentStackFrames: context.react.componentStackFrames,
+		...context.react.version ? { version: context.react.version } : {},
+		...context.react.minifiedError ? { minifiedError: context.react.minifiedError } : {}
+	} } };
+}
+
+//#endregion
+//#region src/FlareErrorBoundary.ts
+var FlareErrorBoundary = class extends Component {
+	flare;
+	constructor(props) {
+		super(props);
+		this.flare = resolveFlare(props.flare);
+		tagReactFramework(this.flare);
+	}
+	state = {
+		error: null,
+		componentStack: []
+	};
+	static getDerivedStateFromError(error) {
+		return { error };
+	}
+	componentDidCatch(error, errorInfo) {
+		this.props.beforeEvaluate?.({
+			error,
+			errorInfo
+		});
+		const context = buildReactContext(errorInfo.componentStack ?? "", error);
+		const finalContext = this.props.beforeSubmit?.({
+			error,
+			errorInfo,
+			context
+		}) ?? context;
+		this.setState({ componentStack: finalContext.react.componentStack });
+		this.flare.reportSilently(error, contextToAttributes(finalContext));
+		this.props.afterSubmit?.({
+			error,
+			errorInfo,
+			context: finalContext
+		});
+	}
+	componentDidUpdate(prevProps) {
+		if (this.state.error === null || !this.props.resetKeys) return;
+		const prevKeys = prevProps.resetKeys;
+		const nextKeys = this.props.resetKeys;
+		const lengthChanged = prevKeys?.length !== nextKeys.length;
+		const valuesChanged = nextKeys.some((key, i) => !Object.is(key, prevKeys?.[i]));
+		if (lengthChanged || valuesChanged) this.reset();
+	}
+	reset = () => {
+		const { error } = this.state;
+		this.props.onReset?.(error);
+		this.setState({
+			error: null,
+			componentStack: []
+		});
+	};
+	render() {
+		const { error } = this.state;
+		if (error !== null) {
+			const { fallback } = this.props;
+			if (typeof fallback === "function") return fallback({
+				error,
+				componentStack: this.state.componentStack,
+				resetErrorBoundary: this.reset
+			});
+			return fallback ?? null;
+		}
+		return this.props.children;
+	}
+};
+
+//#endregion
+//#region src/flareReactErrorHandler.ts
+function flareReactErrorHandler(options) {
+	const flare = resolveFlare(options?.flare);
+	tagReactFramework(flare);
+	return (error, errorInfo) => {
+		const errorObject = convertToError(error);
+		options?.beforeEvaluate?.({
+			error: errorObject,
+			errorInfo
+		});
+		const context = buildReactContext(errorInfo.componentStack ?? "", errorObject);
+		const finalContext = options?.beforeSubmit?.({
+			error: errorObject,
+			errorInfo,
+			context
+		}) ?? context;
+		flare.reportSilently(errorObject, contextToAttributes(finalContext));
+		options?.afterSubmit?.({
+			error: errorObject,
+			errorInfo,
+			context: finalContext
+		});
+	};
+}
+
+//#endregion
+export { registerReactSdkIdentity as i, FlareErrorBoundary as n, registerDefaultFlare as r, flareReactErrorHandler as t };

package/dist/index.cjs

@@ -1,227 +1,11 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-//#region \0rolldown/runtime.js
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") {
-		for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-			key = keys[i];
-			if (!__hasOwnProp.call(to, key) && key !== except) {
-				__defProp(to, key, {
-					get: ((k) => from[k]).bind(null, key),
-					enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-				});
-			}
-		}
-	}
-	return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-	value: mod,
-	enumerable: true
-}) : target, mod));
-
-//#endregion
+const require_flareReactErrorHandler = require('./flareReactErrorHandler-BECMhASE.cjs');
 let _flareapp_js = require("@flareapp/js");
-let react = require("react");
-react = __toESM(react);
-
-//#region src/constants.ts
-const CHROMIUM_STACK_REGEX = /^at\s+(\S+)(?:\s+\((.+):(\d+):(\d+)\))?$/;
-const FIREFOX_SAFARI_STACK_REGEX = /^(\S+?)@(.+):(\d+):(\d+)$/;
-const PACKAGE_VERSION = typeof process !== "undefined" && true ? "2.4.0" : "?";
-
-//#endregion
-//#region src/identify.ts
-let registered = false;
-function registerReactSdkIdentity() {
-	if (registered) return;
-	registered = true;
-	_flareapp_js.flare.setSdkInfo({
-		name: "@flareapp/react",
-		version: PACKAGE_VERSION
-	});
-	_flareapp_js.flare.setFramework({
-		name: "React",
-		version: react.version
-	});
-}
-
-//#endregion
-//#region src/formatComponentStack.ts
-function formatComponentStack(stack) {
-	return stack.split(/\s*\n\s*/g).filter((line) => line.length > 0);
-}
-
-//#endregion
-//#region src/parseComponentStack.ts
-function parseComponentStack(stack) {
-	return stack.split(/\s*\n\s*/g).filter((line) => line.length > 0).map((line) => {
-		const chromeMatch = line.match(CHROMIUM_STACK_REGEX);
-		if (chromeMatch) return {
-			component: chromeMatch[1],
-			file: chromeMatch[2] ?? null,
-			line: chromeMatch[3] ? Number(chromeMatch[3]) : null,
-			column: chromeMatch[4] ? Number(chromeMatch[4]) : null
-		};
-		const firefoxSafariMatch = line.match(FIREFOX_SAFARI_STACK_REGEX);
-		if (firefoxSafariMatch) return {
-			component: firefoxSafariMatch[1],
-			file: firefoxSafariMatch[2],
-			line: Number(firefoxSafariMatch[3]),
-			column: Number(firefoxSafariMatch[4])
-		};
-		return {
-			component: line.replace(/^at\s+/, ""),
-			file: null,
-			line: null,
-			column: null
-		};
-	});
-}
-
-//#endregion
-//#region src/parseMinifiedReactError.ts
-const NUMBER_PATTERN = /Minified React error #(\d+)/;
-const ARG_PATTERN = /args\[\]=([^&\s]*)/g;
-const URL_PATTERN = /(https?:\/\/\S+)/;
-function safeDecode(value) {
-	try {
-		return decodeURIComponent(value);
-	} catch {
-		return value;
-	}
-}
-function parseMinifiedReactError(error) {
-	const message = error?.message;
-	if (!message) return null;
-	const numberMatch = message.match(NUMBER_PATTERN);
-	if (!numberMatch) return null;
-	const args = [];
-	for (const match of message.matchAll(ARG_PATTERN)) args.push(safeDecode(match[1]));
-	const urlMatch = message.match(URL_PATTERN);
-	return {
-		number: Number(numberMatch[1]),
-		args,
-		url: urlMatch ? urlMatch[1] : null
-	};
-}
-
-//#endregion
-//#region src/buildReactContext.ts
-function buildReactContext(rawStack, error) {
-	const minifiedError = parseMinifiedReactError(error);
-	return { react: {
-		componentStack: formatComponentStack(rawStack),
-		componentStackFrames: parseComponentStack(rawStack),
-		version: react.version,
-		...minifiedError ? { minifiedError } : {}
-	} };
-}
-
-//#endregion
-//#region src/contextToAttributes.ts
-function contextToAttributes(context) {
-	return { "context.custom": { react: {
-		componentStack: context.react.componentStack,
-		componentStackFrames: context.react.componentStackFrames,
-		...context.react.version ? { version: context.react.version } : {},
-		...context.react.minifiedError ? { minifiedError: context.react.minifiedError } : {}
-	} } };
-}
 
-//#endregion
-//#region src/FlareErrorBoundary.ts
-var FlareErrorBoundary = class extends react.Component {
-	state = {
-		error: null,
-		componentStack: []
-	};
-	static getDerivedStateFromError(error) {
-		return { error };
-	}
-	componentDidCatch(error, errorInfo) {
-		this.props.beforeEvaluate?.({
-			error,
-			errorInfo
-		});
-		const context = buildReactContext(errorInfo.componentStack ?? "", error);
-		const finalContext = this.props.beforeSubmit?.({
-			error,
-			errorInfo,
-			context
-		}) ?? context;
-		this.setState({ componentStack: finalContext.react.componentStack });
-		_flareapp_js.flare.reportSilently(error, contextToAttributes(finalContext));
-		this.props.afterSubmit?.({
-			error,
-			errorInfo,
-			context: finalContext
-		});
-	}
-	componentDidUpdate(prevProps) {
-		if (this.state.error === null || !this.props.resetKeys) return;
-		const prevKeys = prevProps.resetKeys;
-		const nextKeys = this.props.resetKeys;
-		const lengthChanged = prevKeys?.length !== nextKeys.length;
-		const valuesChanged = nextKeys.some((key, i) => !Object.is(key, prevKeys?.[i]));
-		if (lengthChanged || valuesChanged) this.reset();
-	}
-	reset = () => {
-		const { error } = this.state;
-		this.props.onReset?.(error);
-		this.setState({
-			error: null,
-			componentStack: []
-		});
-	};
-	render() {
-		const { error } = this.state;
-		if (error !== null) {
-			const { fallback } = this.props;
-			if (typeof fallback === "function") return fallback({
-				error,
-				componentStack: this.state.componentStack,
-				resetErrorBoundary: this.reset
-			});
-			return fallback ?? null;
-		}
-		return this.props.children;
-	}
-};
-
-//#endregion
-//#region src/flareReactErrorHandler.ts
-function flareReactErrorHandler(options) {
-	return (error, errorInfo) => {
-		const errorObject = (0, _flareapp_js.convertToError)(error);
-		options?.beforeEvaluate?.({
-			error: errorObject,
-			errorInfo
-		});
-		const context = buildReactContext(errorInfo.componentStack ?? "", errorObject);
-		const finalContext = options?.beforeSubmit?.({
-			error: errorObject,
-			errorInfo,
-			context
-		}) ?? context;
-		_flareapp_js.flare.reportSilently(errorObject, contextToAttributes(finalContext));
-		options?.afterSubmit?.({
-			error: errorObject,
-			errorInfo,
-			context: finalContext
-		});
-	};
-}
-
-//#endregion
 //#region src/index.ts
-registerReactSdkIdentity();
+require_flareReactErrorHandler.registerDefaultFlare(() => _flareapp_js.flare);
+require_flareReactErrorHandler.registerReactSdkIdentity(_flareapp_js.flare);
 
 //#endregion
-exports.FlareErrorBoundary = FlareErrorBoundary;
-exports.flareReactErrorHandler = flareReactErrorHandler;
+exports.FlareErrorBoundary = require_flareReactErrorHandler.FlareErrorBoundary;
+exports.flareReactErrorHandler = require_flareReactErrorHandler.flareReactErrorHandler;

package/dist/index.d.cts

@@ -1,90 +1,2 @@
-import { Component, ErrorInfo, PropsWithChildren, ReactNode } from "react";
-
-//#region src/types.d.ts
-type ComponentStackFrame = {
-  component: string;
-  file: string | null;
-  line: number | null;
-  column: number | null;
-};
-type MinifiedReactError = {
-  number: number;
-  args: string[];
-  url: string | null;
-};
-type FlareReactContext = {
-  react: {
-    componentStack: string[];
-    componentStackFrames: ComponentStackFrame[];
-    version?: string;
-    minifiedError?: MinifiedReactError;
-  };
-};
-//#endregion
-//#region src/FlareErrorBoundary.d.ts
-type FlareErrorBoundaryFallbackProps = {
-  error: Error;
-  componentStack: string[];
-  resetErrorBoundary: () => void;
-};
-type FlareErrorBoundaryProps = PropsWithChildren<{
-  fallback?: ReactNode | ((props: FlareErrorBoundaryFallbackProps) => ReactNode);
-  resetKeys?: unknown[];
-  beforeEvaluate?: (params: {
-    error: Error;
-    errorInfo: ErrorInfo;
-  }) => void;
-  beforeSubmit?: (params: {
-    error: Error;
-    errorInfo: ErrorInfo;
-    context: FlareReactContext;
-  }) => FlareReactContext;
-  afterSubmit?: (params: {
-    error: Error;
-    errorInfo: ErrorInfo;
-    context: FlareReactContext;
-  }) => void;
-  onReset?: (error: Error | null) => void;
-}>;
-type FlareErrorBoundaryState = {
-  error: Error | null;
-  componentStack: string[];
-};
-declare class FlareErrorBoundary extends Component<FlareErrorBoundaryProps, FlareErrorBoundaryState> {
-  state: FlareErrorBoundaryState;
-  static getDerivedStateFromError(error: Error): Partial<FlareErrorBoundaryState>;
-  componentDidCatch(error: Error, errorInfo: ErrorInfo): void;
-  componentDidUpdate(prevProps: FlareErrorBoundaryProps): void;
-  reset: () => void;
-  render(): ReactNode;
-}
-//#endregion
-//#region src/flareReactErrorHandler.d.ts
-type FlareReactErrorHandlerCallback = (error: unknown, errorInfo: {
-  componentStack?: string;
-}) => void;
-type FlareReactErrorHandlerOptions = {
-  beforeEvaluate?: (params: {
-    error: Error;
-    errorInfo: {
-      componentStack?: string;
-    };
-  }) => void;
-  beforeSubmit?: (params: {
-    error: Error;
-    errorInfo: {
-      componentStack?: string;
-    };
-    context: FlareReactContext;
-  }) => FlareReactContext;
-  afterSubmit?: (params: {
-    error: Error;
-    errorInfo: {
-      componentStack?: string;
-    };
-    context: FlareReactContext;
-  }) => void;
-};
-declare function flareReactErrorHandler(options?: FlareReactErrorHandlerOptions): FlareReactErrorHandlerCallback;
-//#endregion
+import { a as FlareErrorBoundaryFallbackProps, c as FlareReactContext, i as FlareErrorBoundary, l as MinifiedReactError, n as FlareReactErrorHandlerOptions, o as FlareErrorBoundaryProps, r as flareReactErrorHandler, s as ComponentStackFrame, t as FlareReactErrorHandlerCallback } from "./flareReactErrorHandler-4Vgqlths.cjs";
 export { type ComponentStackFrame, FlareErrorBoundary, type FlareErrorBoundaryFallbackProps, type FlareErrorBoundaryProps, type FlareReactContext, type FlareReactErrorHandlerCallback, type FlareReactErrorHandlerOptions, type MinifiedReactError, flareReactErrorHandler };

package/dist/index.d.mts

@@ -1,90 +1,2 @@
-import { Component, ErrorInfo, PropsWithChildren, ReactNode } from "react";
-
-//#region src/types.d.ts
-type ComponentStackFrame = {
-  component: string;
-  file: string | null;
-  line: number | null;
-  column: number | null;
-};
-type MinifiedReactError = {
-  number: number;
-  args: string[];
-  url: string | null;
-};
-type FlareReactContext = {
-  react: {
-    componentStack: string[];
-    componentStackFrames: ComponentStackFrame[];
-    version?: string;
-    minifiedError?: MinifiedReactError;
-  };
-};
-//#endregion
-//#region src/FlareErrorBoundary.d.ts
-type FlareErrorBoundaryFallbackProps = {
-  error: Error;
-  componentStack: string[];
-  resetErrorBoundary: () => void;
-};
-type FlareErrorBoundaryProps = PropsWithChildren<{
-  fallback?: ReactNode | ((props: FlareErrorBoundaryFallbackProps) => ReactNode);
-  resetKeys?: unknown[];
-  beforeEvaluate?: (params: {
-    error: Error;
-    errorInfo: ErrorInfo;
-  }) => void;
-  beforeSubmit?: (params: {
-    error: Error;
-    errorInfo: ErrorInfo;
-    context: FlareReactContext;
-  }) => FlareReactContext;
-  afterSubmit?: (params: {
-    error: Error;
-    errorInfo: ErrorInfo;
-    context: FlareReactContext;
-  }) => void;
-  onReset?: (error: Error | null) => void;
-}>;
-type FlareErrorBoundaryState = {
-  error: Error | null;
-  componentStack: string[];
-};
-declare class FlareErrorBoundary extends Component<FlareErrorBoundaryProps, FlareErrorBoundaryState> {
-  state: FlareErrorBoundaryState;
-  static getDerivedStateFromError(error: Error): Partial<FlareErrorBoundaryState>;
-  componentDidCatch(error: Error, errorInfo: ErrorInfo): void;
-  componentDidUpdate(prevProps: FlareErrorBoundaryProps): void;
-  reset: () => void;
-  render(): ReactNode;
-}
-//#endregion
-//#region src/flareReactErrorHandler.d.ts
-type FlareReactErrorHandlerCallback = (error: unknown, errorInfo: {
-  componentStack?: string;
-}) => void;
-type FlareReactErrorHandlerOptions = {
-  beforeEvaluate?: (params: {
-    error: Error;
-    errorInfo: {
-      componentStack?: string;
-    };
-  }) => void;
-  beforeSubmit?: (params: {
-    error: Error;
-    errorInfo: {
-      componentStack?: string;
-    };
-    context: FlareReactContext;
-  }) => FlareReactContext;
-  afterSubmit?: (params: {
-    error: Error;
-    errorInfo: {
-      componentStack?: string;
-    };
-    context: FlareReactContext;
-  }) => void;
-};
-declare function flareReactErrorHandler(options?: FlareReactErrorHandlerOptions): FlareReactErrorHandlerCallback;
-//#endregion
+import { a as FlareErrorBoundaryFallbackProps, c as FlareReactContext, i as FlareErrorBoundary, l as MinifiedReactError, n as FlareReactErrorHandlerOptions, o as FlareErrorBoundaryProps, r as flareReactErrorHandler, s as ComponentStackFrame, t as FlareReactErrorHandlerCallback } from "./flareReactErrorHandler-BcVYRMtC.mjs";
 export { type ComponentStackFrame, FlareErrorBoundary, type FlareErrorBoundaryFallbackProps, type FlareErrorBoundaryProps, type FlareReactContext, type FlareReactErrorHandlerCallback, type FlareReactErrorHandlerOptions, type MinifiedReactError, flareReactErrorHandler };