Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions packages/relay-runtime/network/RelayNetworkTypes.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export interface PayloadError {
}>
| undefined;
path?: Array<string | number>;
extensions?: PayloadExtensions | undefined;
severity?: 'CRITICAL' | 'ERROR' | 'WARNING' | undefined; // Not officially part of the spec, but used at Facebook
}

Expand Down
1 change: 1 addition & 0 deletions packages/relay-runtime/network/RelayNetworkTypes.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export type PayloadError = interface {
...
}>,
path?: Array<string | number>,
extensions?: PayloadExtensions,
// Not officially part of the spec, but used at Facebook
severity?: 'CRITICAL' | 'ERROR' | 'WARNING',
};
Expand Down
34 changes: 11 additions & 23 deletions packages/relay-runtime/store/RelayErrorTrie.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@

'use strict';

import type {PayloadError} from '../network/RelayNetworkTypes';
import type {
PayloadError,
PayloadExtensions,
} from '../network/RelayNetworkTypes';

// $FlowFixMe[recursive-definition]
const SELF: Self = Symbol('$SELF');
Expand All @@ -27,6 +30,7 @@ export type TRelayFieldErrorForDisplay = Readonly<{
export type TRelayFieldError = Readonly<{
...TRelayFieldErrorForDisplay,
message: string,
extensions?: PayloadExtensions,
}>;

/**
Expand Down Expand Up @@ -108,26 +112,14 @@ function getErrorsByKey(
if (Array.isArray(value)) {
return value;
}
const errors: Array<
Readonly<{
message: string,
path?: Array<string | number>,
severity?: 'CRITICAL' | 'ERROR' | 'WARNING',
}>,
> = [];
const errors: Array<TRelayFieldError> = [];
recursivelyCopyErrorsIntoArray(value, errors);
return errors;
}

function recursivelyCopyErrorsIntoArray(
trieOrSet: RelayErrorTrie,
errors: Array<
Readonly<{
message: string,
path?: Array<string | number>,
severity?: 'CRITICAL' | 'ERROR' | 'WARNING',
}>,
>,
errors: Array<TRelayFieldError>,
): void {
for (const [childKey, value] of trieOrSet) {
const oldLength = errors.length;
Expand All @@ -142,14 +134,10 @@ function recursivelyCopyErrorsIntoArray(
const newLength = errors.length;
for (let index = oldLength; index < newLength; index++) {
const error = errors[index];
if (error.path == null) {
errors[index] = {
...error,
path: [childKey],
};
} else {
error.path.unshift(childKey);
}
errors[index] = {
...error,
path: error.path == null ? [childKey] : [childKey, ...error.path],
};
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions packages/relay-runtime/store/RelayStoreTypes.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
Network,
PayloadData,
PayloadError,
PayloadExtensions,
ReactFlightServerTree,
UploadableMap,
} from '../network/RelayNetworkTypes';
Expand Down Expand Up @@ -1004,6 +1005,7 @@ export type TRelayFieldError =
& TRelayFieldErrorForDisplay
& Readonly<{
message: string;
extensions?: PayloadExtensions | undefined;
}>;

/**
Expand Down
Loading