Skip to content

fix: reject with error, not event #351

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

Merged
merged 2 commits into from
Aug 16, 2021
Merged

fix: reject with error, not event #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d340355
fix: reject with error, not event
jpoehnelt Aug 16, 2021
04ec125
fix: narrow Event to ErrorEvent
jpoehnelt Aug 16, 2021
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
64 changes: 44 additions & 20 deletions src/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,11 @@ test("loadCallback callback should fire", () => {
test("script onerror should reject promise", async () => {
const loader = new Loader({ apiKey: "foo", retries: 0 });

const rejection = expect(loader.load()).rejects.toBeInstanceOf(ErrorEvent);
const rejection = expect(loader.load()).rejects.toBeInstanceOf(Error);

loader["loadErrorCallback"](document.createEvent("ErrorEvent"));
loader["loadErrorCallback"](
new ErrorEvent("ErrorEvent(", { error: new Error("") })
);

await rejection;
expect(loader["done"]).toBeTruthy();
Expand All @@ -132,16 +134,20 @@ test("script onerror should reject promise with multiple loaders", async () => {
const loader = new Loader({ apiKey: "foo", retries: 0 });
const extraLoader = new Loader({ apiKey: "foo", retries: 0 });

let rejection = expect(loader.load()).rejects.toBeInstanceOf(ErrorEvent);
loader["loadErrorCallback"](document.createEvent("ErrorEvent"));
let rejection = expect(loader.load()).rejects.toBeInstanceOf(Error);
loader["loadErrorCallback"](
new ErrorEvent("ErrorEvent(", { error: new Error("") })
);

await rejection;
expect(loader["done"]).toBeTruthy();
expect(loader["loading"]).toBeFalsy();
expect(loader["onerrorEvent"]).toBeInstanceOf(ErrorEvent);

rejection = expect(extraLoader.load()).rejects.toBeInstanceOf(ErrorEvent);
loader["loadErrorCallback"](document.createEvent("ErrorEvent"));
rejection = expect(extraLoader.load()).rejects.toBeInstanceOf(Error);
loader["loadErrorCallback"](
new ErrorEvent("ErrorEvent(", { error: new Error("") })
);

await rejection;
expect(extraLoader["done"]).toBeTruthy();
Expand All @@ -151,12 +157,16 @@ test("script onerror should reject promise with multiple loaders", async () => {
test("script onerror should retry", async () => {
const loader = new Loader({ apiKey: "foo", retries: 1 });
const deleteScript = jest.spyOn(loader, "deleteScript");
const rejection = expect(loader.load()).rejects.toBeInstanceOf(ErrorEvent);
const rejection = expect(loader.load()).rejects.toBeInstanceOf(Error);
// eslint-disable-next-line @typescript-eslint/no-empty-function
console.log = jest.fn();

loader["loadErrorCallback"](document.createEvent("ErrorEvent"));
loader["loadErrorCallback"](document.createEvent("ErrorEvent"));
loader["loadErrorCallback"](
new ErrorEvent("ErrorEvent(", { error: new Error("") })
);
loader["loadErrorCallback"](
new ErrorEvent("ErrorEvent(", { error: new Error("") })
);
jest.runAllTimers();

await rejection;
Expand All @@ -173,19 +183,27 @@ test("script onerror should reset retry mechanism with next loader", async () =>
// eslint-disable-next-line @typescript-eslint/no-empty-function
console.log = jest.fn();

let rejection = expect(loader.load()).rejects.toBeInstanceOf(ErrorEvent);
loader["loadErrorCallback"](document.createEvent("ErrorEvent"));
loader["loadErrorCallback"](document.createEvent("ErrorEvent"));
let rejection = expect(loader.load()).rejects.toBeInstanceOf(Error);
loader["loadErrorCallback"](
new ErrorEvent("ErrorEvent(", { error: new Error("") })
);
loader["loadErrorCallback"](
new ErrorEvent("ErrorEvent(", { error: new Error("") })
);
jest.runAllTimers();
await rejection;

rejection = expect(loader.load()).rejects.toBeInstanceOf(ErrorEvent);
rejection = expect(loader.load()).rejects.toBeInstanceOf(Error);
expect(loader["done"]).toBeFalsy();
expect(loader["loading"]).toBeTruthy();
expect(loader["errors"].length).toBe(0);

loader["loadErrorCallback"](document.createEvent("ErrorEvent"));
loader["loadErrorCallback"](document.createEvent("ErrorEvent"));
loader["loadErrorCallback"](
new ErrorEvent("ErrorEvent(", { error: new Error("") })
);
loader["loadErrorCallback"](
new ErrorEvent("ErrorEvent(", { error: new Error("") })
);
jest.runAllTimers();

await rejection;
Expand All @@ -199,10 +217,14 @@ test("script onerror should not reset retry mechanism with parallel loaders", as
// eslint-disable-next-line @typescript-eslint/no-empty-function
console.log = jest.fn();

const rejection1 = expect(loader.load()).rejects.toBeInstanceOf(ErrorEvent);
const rejection2 = expect(loader.load()).rejects.toBeInstanceOf(ErrorEvent);
loader["loadErrorCallback"](document.createEvent("ErrorEvent"));
loader["loadErrorCallback"](document.createEvent("ErrorEvent"));
const rejection1 = expect(loader.load()).rejects.toBeInstanceOf(Error);
const rejection2 = expect(loader.load()).rejects.toBeInstanceOf(Error);
loader["loadErrorCallback"](
new ErrorEvent("ErrorEvent(", { error: new Error("") })
);
loader["loadErrorCallback"](
new ErrorEvent("ErrorEvent(", { error: new Error("") })
);
jest.runAllTimers();

await Promise.all([rejection1, rejection2]);
Expand Down Expand Up @@ -301,7 +323,9 @@ test("loader should resolve immediately when failed loading", async () => {
// use await/async pattern since the promise rejects without trigger
const loader = new Loader({ apiKey: "foo", retries: 0 });
loader["done"] = true;
loader["onerrorEvent"] = document.createEvent("ErrorEvent");
loader["onerrorEvent"] = new ErrorEvent("ErrorEvent(", {
error: new Error(""),
});

await expect(loader.loadPromise()).rejects.toBeDefined();
});
Expand Down
10 changes: 5 additions & 5 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,10 +241,10 @@ export class Loader {
url: string;

private CALLBACK = "__googleMapsCallback";
private callbacks: ((e: Event) => void)[] = [];
private callbacks: ((e: ErrorEvent) => void)[] = [];
private done = false;
private loading = false;
private onerrorEvent: Event;
private onerrorEvent: ErrorEvent;
private static instance: Loader;
private errors: ErrorEvent[] = [];

Expand Down Expand Up @@ -378,11 +378,11 @@ export class Loader {
*/
loadPromise(): Promise<typeof google> {
return new Promise((resolve, reject) => {
this.loadCallback((err: Event) => {
this.loadCallback((err: ErrorEvent) => {
if (!err) {
resolve(window.google);
} else {
reject(err);
reject(err.error);
}
});
});
Expand All @@ -391,7 +391,7 @@ export class Loader {
/**
* Load the Google Maps JavaScript API script with a callback.
*/
loadCallback(fn: (e: Event) => void): void {
loadCallback(fn: (e: ErrorEvent) => void): void {
this.callbacks.push(fn);
this.execute();
}
Expand Down