Skip to content

Update error handling to account for TS v4.4 auto unknown variable in… #6320

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.

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

Merged
merged 1 commit into from
Jun 2, 2022
Merged
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
6 changes: 3 additions & 3 deletions packages/app-check/src/client.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ describe('client', () => {
const firebaseError = ERROR_FACTORY.create(
AppCheckError.FETCH_NETWORK_ERROR,
{
originalErrorMessage: originalError.message
originalErrorMessage: (originalError as Error)?.message
}
);

Expand Down Expand Up @@ -164,7 +164,7 @@ describe('client', () => {
const firebaseError = ERROR_FACTORY.create(
AppCheckError.FETCH_PARSE_ERROR,
{
originalErrorMessage: originalError.message
originalErrorMessage: (originalError as Error)?.message
}
);

Expand All @@ -178,7 +178,7 @@ describe('client', () => {
expect(e).has.property('message', firebaseError.message);
expect(e).has.nested.property(
'customData.originalErrorMessage',
originalError.message
(originalError as Error)?.message
);
}
});
Expand Down
4 changes: 2 additions & 2 deletions packages/app-check/src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export async function exchangeToken(
response = await fetch(url, options);
} catch (originalError) {
throw ERROR_FACTORY.create(AppCheckError.FETCH_NETWORK_ERROR, {
originalErrorMessage: originalError.message
originalErrorMessage: (originalError as Error)?.message
});
}

Expand All @@ -83,7 +83,7 @@ export async function exchangeToken(
responseBody = await response.json();
} catch (originalError) {
throw ERROR_FACTORY.create(AppCheckError.FETCH_PARSE_ERROR, {
originalErrorMessage: originalError.message
originalErrorMessage: (originalError as Error)?.message
});
}

Expand Down
2 changes: 1 addition & 1 deletion packages/app-check/src/indexeddb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function getDBPromise(): Promise<IDBDatabase> {
} catch (e) {
reject(
ERROR_FACTORY.create(AppCheckError.STORAGE_OPEN, {
originalErrorMessage: e.message
originalErrorMessage: (e as Error)?.message
})
);
}
Expand Down
4 changes: 2 additions & 2 deletions packages/app/src/indexeddb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export async function readHeartbeatsFromIndexedDB(
.get(computeKey(app)) as Promise<HeartbeatsInIndexedDB | undefined>;
} catch (e) {
throw ERROR_FACTORY.create(AppError.STORAGE_GET, {
originalErrorMessage: e.message
originalErrorMessage: (e as Error)?.message
});
}
}
Expand All @@ -83,7 +83,7 @@ export async function writeHeartbeatsToIndexedDB(
return tx.done;
} catch (e) {
throw ERROR_FACTORY.create(AppError.STORAGE_WRITE, {
originalErrorMessage: e.message
originalErrorMessage: (e as Error)?.message
});
}
}
Expand Down
6 changes: 3 additions & 3 deletions packages/remote-config/src/client/rest_client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,11 @@ export class RestClient implements RemoteConfigFetchClient {
response = await fetchPromise;
} catch (originalError) {
let errorCode = ErrorCode.FETCH_NETWORK;
if (originalError.name === 'AbortError') {
if ((originalError as Error)?.name === 'AbortError') {
errorCode = ErrorCode.FETCH_TIMEOUT;
}
throw ERROR_FACTORY.create(errorCode, {
originalErrorMessage: originalError.message
originalErrorMessage: (originalError as Error)?.message
});
}

Expand All @@ -144,7 +144,7 @@ export class RestClient implements RemoteConfigFetchClient {
responseBody = await response.json();
} catch (originalError) {
throw ERROR_FACTORY.create(ErrorCode.FETCH_PARSE, {
originalErrorMessage: originalError.message
originalErrorMessage: (originalError as Error)?.message
});
}
config = responseBody['entries'];
Expand Down
2 changes: 1 addition & 1 deletion packages/remote-config/src/client/retrying_client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ export class RetryingClient implements RemoteConfigFetchClient {

return response;
} catch (e) {
if (!isRetriableError(e)) {
if (!isRetriableError(e as Error)) {
throw e;
}

Expand Down
10 changes: 5 additions & 5 deletions packages/remote-config/src/storage/storage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { FirebaseError } from '@firebase/util';
function toFirebaseError(event: Event, errorCode: ErrorCode): FirebaseError {
const originalError = (event.target as IDBRequest).error || undefined;
return ERROR_FACTORY.create(errorCode, {
originalErrorMessage: originalError && originalError.message
originalErrorMessage: originalError && (originalError as Error)?.message
});
}

Expand Down Expand Up @@ -101,7 +101,7 @@ export function openDatabase(): Promise<IDBDatabase> {
} catch (error) {
reject(
ERROR_FACTORY.create(ErrorCode.STORAGE_OPEN, {
originalErrorMessage: error
originalErrorMessage: (error as Error)?.message
})
);
}
Expand Down Expand Up @@ -203,7 +203,7 @@ export class Storage {
} catch (e) {
reject(
ERROR_FACTORY.create(ErrorCode.STORAGE_GET, {
originalErrorMessage: e && e.message
originalErrorMessage: (e as Error)?.message
})
);
}
Expand All @@ -230,7 +230,7 @@ export class Storage {
} catch (e) {
reject(
ERROR_FACTORY.create(ErrorCode.STORAGE_SET, {
originalErrorMessage: e && e.message
originalErrorMessage: (e as Error)?.message
})
);
}
Expand All @@ -254,7 +254,7 @@ export class Storage {
} catch (e) {
reject(
ERROR_FACTORY.create(ErrorCode.STORAGE_DELETE, {
originalErrorMessage: e && e.message
originalErrorMessage: (e as Error)?.message
})
);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/remote-config/test/client/rest_client.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ describe('RestClient', () => {
const fetchPromise = client.fetch(DEFAULT_REQUEST);

const firebaseError = ERROR_FACTORY.create(ErrorCode.FETCH_NETWORK, {
originalErrorMessage: originalError.message
originalErrorMessage: (originalError as Error)?.message
});

await expect(fetchPromise)
Expand Down
7 changes: 4 additions & 3 deletions packages/util/test/errors.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ describe('FirebaseError', () => {
try {
throw e;
} catch (error) {
assert.isDefined(error.stack);
assert.isDefined((error as Error).stack);
// Multi-line match trick - .* does not match \n
assert.match(error.stack, /FirebaseError[\s\S]/);
assert.match((error as Error).stack!, /FirebaseError[\s\S]/);
}
});

Expand All @@ -100,7 +100,8 @@ describe('FirebaseError', () => {
assert.ok(false);
} catch (e) {
assert.instanceOf(e, FirebaseError);
assert.match(e.stack, /dummy2[\s\S]*?dummy1/);
assert.isDefined((e as FirebaseError).stack);
assert.match((e as FirebaseError).stack!, /dummy2[\s\S]*?dummy1/);
}
});
});
Expand Down