Merge pull request #68 from thejoecode/main

Bug fix: Page is not being passed to queryPage from Cards.search
ChiriVulpes · Oct 22, 2023 · 8db0221 · 8db0221
2 parents 7f79389 + c489edc
commit 8db0221
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 20 deletions.
diff --git a/src/api/Cards.ts b/src/api/Cards.ts
@@ -631,6 +631,15 @@ class Cards extends MagicQuerier {
 	/**
 	 * Returns a MagicEmitter of every card in the Scryfall database that matches the given query.
 	 */
+	public search (query: string, options?: SearchOptions): MagicEmitter<Card>;
+	/**
+	 * Returns a MagicEmitter of every card in the Scryfall database that matches the given query.
+	 */
+	public search (query: string, page?: number): MagicEmitter<Card>;
+	/**
+	 * Returns a MagicEmitter of every card in the Scryfall database that matches the given query.
+	 */
+	public search (query: string, options?: SearchOptions | number): MagicEmitter<Card>;
 	public search (query: string, options?: SearchOptions | number) {
 		const emitter = new MagicEmitter<Card>()
 			.map(Card.construct);

diff --git a/src/api/Migrations.ts b/src/api/Migrations.ts
@@ -23,7 +23,7 @@ export interface Migration {
 }
 
 class Migrations extends MagicQuerier {
-	public all (page?: number) {
+	public all (page = 1) {
 		const emitter = new MagicEmitter<Migration>();
 
 		this.queryPage(emitter, "migrations", {}, page)

diff --git a/src/tests/Main.ts b/src/tests/Main.ts
@@ -155,24 +155,17 @@ describe("Scry", function () {
 		}).timeout(15000);
 
 		it("should support pagination of searches", async () => {
-			let firstPageCard: Scry.Card;
-			let secondPageCard: Scry.Card;
-
-			await Promise.all([
-				new Promise((resolve, reject) => {
-					const emitter = Scry.Cards.search("type:creature");
-					emitter.on("data", card => (firstPageCard = card, emitter.cancel()))
-						.on("end", () => reject(new Error("Did not expect to reach this point")))
-						.on("cancel", resolve)
-						.on("error", reject);
-				}),
-				new Promise((resolve, reject) => {
-					const emitter = Scry.Cards.search("type:creature", 2).cancelAfterPage();
-					emitter.on("data", card => secondPageCard = card)
-						.on("end", () => reject(new Error("Did not expect to reach this point")))
-						.on("cancel", resolve)
-						.on("error", reject);
-				}),
+			const [firstPageCard, secondPageCard] = await Promise.all([
+				new Promise<Scry.Card>((resolve, reject) => Scry.Cards.search("type:creature")
+					.cancelAfterPage()
+					.waitForAll()
+					.then(cards => cards[0])
+					.then(resolve, reject)),
+				new Promise<Scry.Card>((resolve, reject) => Scry.Cards.search("type:creature", 2)
+					.cancelAfterPage()
+					.waitForAll()
+					.then(cards => cards[0])
+					.then(resolve, reject)),
 			]);
 
 			expect(firstPageCard!.id).not.eq(secondPageCard!.id);

diff --git a/src/util/MagicQuerier.ts b/src/util/MagicQuerier.ts
@@ -88,7 +88,7 @@ export default class MagicQuerier {
 		return result;
 	}
 
-	protected async queryPage<T> (emitter: MagicEmitter<T>, apiPath: string, query: any, page = 1): Promise<void> {
+	protected async queryPage<T> (emitter: MagicEmitter<T>, apiPath: string, query: any, page = query?.page as number | undefined ?? 1): Promise<void> {
 		let error: SearchError | undefined;
 		const results = await this.query<List<T>>(apiPath, { ...query, page })
 			.catch(err => error = err);