Skip to content

Preserve Error prototypes in structuredClone #58215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OskarEichler wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −16
Open

Preserve Error prototypes in structuredClone #58215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions packages/react-native/src/private/webapis/structuredClone/__tests__/structuredClone-itest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,22 +226,30 @@ describe('structuredClone', () => {
// Valid error names
value.name = 'Error';
expect(structuredClone(value).name).toBe('Error');
expect(structuredClone(value)).toBeInstanceOf(Error);
value.name = 'EvalError';
expect(structuredClone(value).name).toBe('EvalError');
expect(structuredClone(value)).toBeInstanceOf(EvalError);
value.name = 'RangeError';
expect(structuredClone(value).name).toBe('RangeError');
expect(structuredClone(value)).toBeInstanceOf(RangeError);
value.name = 'ReferenceError';
expect(structuredClone(value).name).toBe('ReferenceError');
expect(structuredClone(value)).toBeInstanceOf(ReferenceError);
value.name = 'SyntaxError';
expect(structuredClone(value).name).toBe('SyntaxError');
expect(structuredClone(value)).toBeInstanceOf(SyntaxError);
value.name = 'TypeError';
expect(structuredClone(value).name).toBe('TypeError');
expect(structuredClone(value)).toBeInstanceOf(TypeError);
value.name = 'URIError';
expect(structuredClone(value).name).toBe('URIError');
expect(structuredClone(value)).toBeInstanceOf(URIError);

// Invalid error names
value.name = 'FooError';
expect(structuredClone(value).name).toBe('Error');
expect(structuredClone(value)).toBeInstanceOf(Error);
});

it('clones values deeply', () => {
Expand Down
27 changes: 11 additions & 16 deletions packages/react-native/src/private/webapis/structuredClone/structuredClone.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ import {
isPlatformObject,
} from '../webidl/PlatformObjects';

const VALID_ERROR_NAMES = new Set([
'Error',
'EvalError',
'RangeError',
'ReferenceError',
'SyntaxError',
'TypeError',
'URIError',
const ERROR_CONSTRUCTORS: Map<string, Class<Error>> = new Map([
['Error', Error],
['EvalError', EvalError],
['RangeError', RangeError],
['ReferenceError', ReferenceError],
['SyntaxError', SyntaxError],
['TypeError', TypeError],
['URIError', URIError],
]);

const BASIC_CONSTRUCTORS = [Number, String, Boolean, Date];
Expand Down Expand Up @@ -149,17 +149,12 @@ function structuredCloneInternal<T>(value: T): T {
}

if (value instanceof Error) {
const ErrorConstructor = ERROR_CONSTRUCTORS.get(value.name) ?? Error;
const result = value.cause
? new Error(value.message, {cause: value.cause})
: new Error(value.message);
? new ErrorConstructor(value.message, {cause: value.cause})
: new ErrorConstructor(value.message);
memory.set(value, result);

if (VALID_ERROR_NAMES.has(value.name)) {
result.name = value.name;
} else {
result.name = 'Error';
}

result.stack = value.stack;

// $FlowExpectedError[incompatible-type] we know result is T
Expand Down
Loading