-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
expose
setErrorMessageHandler
(#11694)
* expose `setErrorMessageHandler` * changeset * Clean up Prettier, Size-limit, and Api-Extractor * add export to exports shape test * add some clarifying comments and two more tests * Clean up Prettier, Size-limit, and Api-Extractor * Update eleven-doors-rescue.md --------- Co-authored-by: phryneas <[email protected]>
- Loading branch information
Showing
8 changed files
with
159 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
"@apollo/client": patch | ||
--- | ||
|
||
Expose `setErrorMessageHandler` from `@apollo/client/dev` entrypoint. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
export { loadDevMessages } from "./loadDevMessages.js"; | ||
export { loadErrorMessageHandler } from "./loadErrorMessageHandler.js"; | ||
export { loadErrorMessages } from "./loadErrorMessages.js"; | ||
export { setErrorMessageHandler } from "./setErrorMessageHandler.js"; | ||
export type { ErrorMessageHandler } from "./setErrorMessageHandler.js"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,27 +1,31 @@ | ||
import type { ErrorCodes } from "../invariantErrorCodes.js"; | ||
import { global } from "../utilities/globals/index.js"; | ||
import { ApolloErrorMessageHandler } from "../utilities/globals/invariantWrappers.js"; | ||
import type { ErrorMessageHandler } from "./setErrorMessageHandler.js"; | ||
import { setErrorMessageHandler } from "./setErrorMessageHandler.js"; | ||
|
||
/** | ||
* Injects Apollo Client's default error message handler into the application and | ||
* also loads the error codes that are passed in as arguments. | ||
*/ | ||
export function loadErrorMessageHandler(...errorCodes: ErrorCodes[]) { | ||
if (!global[ApolloErrorMessageHandler]) { | ||
global[ApolloErrorMessageHandler] = handler as typeof handler & ErrorCodes; | ||
} | ||
setErrorMessageHandler(handler as typeof handler & ErrorCodes); | ||
|
||
for (const codes of errorCodes) { | ||
Object.assign(global[ApolloErrorMessageHandler], codes); | ||
Object.assign(handler, codes); | ||
} | ||
|
||
return global[ApolloErrorMessageHandler]; | ||
return handler; | ||
} | ||
|
||
function handler(message: string | number, args: unknown[]) { | ||
if (typeof message === "number") { | ||
const definition = global[ApolloErrorMessageHandler]![message]; | ||
if (!message || !definition?.message) return; | ||
message = definition.message; | ||
} | ||
return args.reduce<string>( | ||
(msg, arg) => msg.replace(/%[sdfo]/, String(arg)), | ||
String(message) | ||
); | ||
const handler = ((message: string | number, args: unknown[]) => { | ||
if (typeof message === "number") { | ||
const definition = global[ApolloErrorMessageHandler]![message]; | ||
if (!message || !definition?.message) return; | ||
message = definition.message; | ||
} | ||
} | ||
return args.reduce<string>( | ||
(msg, arg) => msg.replace(/%[sdfo]/, String(arg)), | ||
String(message) | ||
); | ||
}) as ErrorMessageHandler & ErrorCodes; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
import type { ErrorCodes } from "../invariantErrorCodes.js"; | ||
import { global } from "../utilities/globals/index.js"; | ||
import { ApolloErrorMessageHandler } from "../utilities/globals/invariantWrappers.js"; | ||
|
||
/** | ||
* The error message handler is a function that is called when a message is | ||
* logged or an error is thrown to determine the contents of the error message | ||
* to be logged or thrown. | ||
*/ | ||
export type ErrorMessageHandler = { | ||
/** | ||
* @param message - Usually the error message number (as defined in | ||
* `@apollo/client/invariantErrorCodes.js`). | ||
* In some edge cases, this can already be a string, that can be passed through | ||
* as an error message. | ||
* | ||
* @param args - The placeholders that can be passed into the error message (pre-stringified). | ||
* These relate with the `%s` and `%d` [substitution strings](https://developer.mozilla.org/en-US/docs/Web/API/console#using_string_substitutions) | ||
* in the error message defined in `@apollo/client/invariantErrorCodes.js`. | ||
* | ||
* ⚠️ Note that arguments will only be passed in for error messages. | ||
* For normal log messages, you will get an empty array here and they will directly | ||
* be passed to `console.log` instead, to have the string subsitution done by the | ||
* engine, as that allows for nicer (and in the case of a browser, interactive) | ||
* output. | ||
* | ||
* @returns The error message to be logged or thrown. If it returns `undefined`, | ||
* the mechanism will fall back to the default: | ||
* A link to https://go.apollo.dev/c/err with Apollo Client version, | ||
* the error message number, and the error message arguments encoded into | ||
* the URL hash. | ||
*/ (message: string | number, args: string[]): string | undefined; | ||
}; | ||
|
||
/** | ||
* Overrides the global "Error Message Handler" with a custom implementation. | ||
*/ | ||
export function setErrorMessageHandler(handler: ErrorMessageHandler) { | ||
global[ApolloErrorMessageHandler] = handler as typeof handler & ErrorCodes; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters