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
24 changes: 24 additions & 0 deletions packages/core/src/utils/errors.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,30 @@ describe('getErrorMessage', () => {
};
expect(getErrorMessage(error)).toBe('Bad Request Message');
});

it('should remove a trailing period from URLs in error messages', () => {
const error = new Error('Migrate to https://antigravity.google.');

expect(getErrorMessage(error)).toBe(
'Migrate to https://antigravity.google',
);
});

it('should preserve periods that do not trail a URL', () => {
expect(getErrorMessage(new Error('Authentication failed.'))).toBe(
'Authentication failed.',
);
});

it.each([null, undefined])(
'should handle an Error with a nullish message',
(message) => {
const error = new Error('original');
Object.defineProperty(error, 'message', { value: message });

expect(getErrorMessage(error)).toBe('');
},
);
});

describe('isAbortError', () => {
Expand Down
13 changes: 10 additions & 3 deletions packages/core/src/utils/errors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,16 @@ export function isAbortError(error: unknown): boolean {
return error instanceof Error && error.name === 'AbortError';
}

function stripTrailingPeriodsFromUrls(
message: string | null | undefined,
): string {
return message?.replace(/(https?:\/\/\S+)\.(?=\s|$)/g, '$1') ?? '';
}

export function getErrorMessage(error: unknown): string {
const friendlyError = toFriendlyError(error);
if (friendlyError instanceof Error) {
return friendlyError.message;
return stripTrailingPeriodsFromUrls(friendlyError.message);
}
if (
typeof friendlyError === 'object' &&
Expand All @@ -45,10 +51,11 @@ export function getErrorMessage(error: unknown): string {
typeof (friendlyError as { message: unknown }).message === 'string'
) {
// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
return (friendlyError as { message: string }).message;
const message = (friendlyError as { message: string }).message;
return stripTrailingPeriodsFromUrls(message);
}
try {
return String(friendlyError);
return stripTrailingPeriodsFromUrls(String(friendlyError));
} catch {
return 'Failed to get error details';
}
Expand Down