(#169) [Proposal] Use promise-like return type instead of wrapping a promise by hand

Author: svettwer

Diff for: lib/provider/opencv/template-matching-finder.class.spec.ts

@@ -65,10 +65,7 @@ describe("Template-matching finder", () => {
         // THEN
         await expect(SUT.findMatch(matchRequest))
             .rejects
-            .toEqual(
-                expect
-                    .stringMatching(expectedRejection)
-            );
+            .toThrowError(expectedRejection);
     });
 
     it("findMatch should throw on invalid image paths", async () => {
@@ -102,7 +99,7 @@ describe("Template-matching finder", () => {
         const minConfidence = 0.99;
         const searchRegion = new Region(0, 0, haystack.width, haystack.height);
         const matchRequest = new MatchRequest(haystack, needlePath, searchRegion, minConfidence);
-        const expectedRejection = "The provided image sample is larger than the provided search region"
+        const expectedRejection = new Error("The provided image sample is larger than the provided search region")
 
         // WHEN
         const findMatchPromise = SUT.findMatch(matchRequest);

Diff for: lib/provider/opencv/template-matching-finder.class.ts

@@ -132,29 +132,24 @@ export default class TemplateMatchingFinder implements FinderInterface {
     }
 
     public async findMatch(matchRequest: MatchRequest, debug: boolean = false): Promise<MatchResult> {
-        return new Promise<MatchResult>(async (resolve, reject) => {
-            try {
-                const matches = await this.findMatches(matchRequest, debug);
-                const potentialMatches = matches
-                    .filter(match => match.confidence >= matchRequest.confidence);
-                if (potentialMatches.length === 0) {
-                    matches.sort((a, b) => a.confidence - b.confidence);
-                    const bestMatch = matches.pop();
-                    if (bestMatch) {
-                        if(bestMatch.error) {
-                            reject(bestMatch.error.message)
-                        }else {
-                            reject(`No match with required confidence ${matchRequest.confidence}. Best match: ${bestMatch.confidence} at ${bestMatch.location}`)
-                        }
-                    } else {
-                        reject(`Unable to locate ${matchRequest.pathToNeedle}, no match!`);
-                    }
+
+        const matches = await this.findMatches(matchRequest, debug);
+        const potentialMatches = matches
+            .filter(match => match.confidence >= matchRequest.confidence);
+        if (potentialMatches.length === 0) {
+            matches.sort((a, b) => a.confidence - b.confidence);
+            const bestMatch = matches.pop();
+            if (bestMatch) {
+                if(bestMatch.error) {
+                    throw new Error(bestMatch.error.message)
+                }else {
+                    throw new Error(`No match with required confidence ${matchRequest.confidence}. Best match: ${bestMatch.confidence} at ${bestMatch.location}`)
                 }
-                resolve(potentialMatches[0]);
-            } catch (e) {
-                reject(e);
+            } else {
+                throw new Error(`Unable to locate ${matchRequest.pathToNeedle}, no match!`);
             }
-        });
+        }
+        return potentialMatches[0];
     }
 
     private searchMultipleScales(needle: cv.Mat, haystack: cv.Mat) {