small change and added test

maximilianMairinger · Sep 10, 2023 · 5d1ee32 · 5d1ee32
1 parent cdd6ac3
commit 5d1ee32
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 9 deletions.
diff --git a/app/src/sanitizeAgainst.ts b/app/src/sanitizeAgainst.ts
@@ -27,7 +27,7 @@ abstract class Matcher {
 }
 
 
-
+const isPromiseSani = sanitizeRec(Promise)
 export class AWAITED<Pat extends Pattern> extends Matcher {
   public sani: Function
   constructor(private _pattern: Pat) {
@@ -40,7 +40,7 @@ export class AWAITED<Pat extends Pattern> extends Matcher {
     return this._pattern instanceof AWAITED ? this._pattern.pattern : this._pattern
   }
   matches(input: unknown): unknown {
-    sanitizeRec(Promise)(input)
+    isPromiseSani(input)
     const myKnownInputObjects = knownInputObjects
     return (input as Promise<any>).then((input) => {
       knownInputObjects = myKnownInputObjects

diff --git a/test/src/test.ts b/test/src/test.ts
@@ -307,31 +307,55 @@ describe("core", () => {
     })
 
     describe("Combinator with awaited", () => {
-      test("Or with one awaited", async () => {
+      test("Or with one awaited 1", async () => {
         let against = sani(new OR(new AWAITED(Number), String))
-        expect.assertions(4)
 
+        expect(against(Promise.resolve(3))).toBeInstanceOf(Promise)
+        expect(against("asd")).toBeInstanceOf(Promise)
         expect(await against(Promise.resolve(3))).eq(3)
         expect(async () => await against(4)).rejects.toThrow()
         expect(async () => await against(Promise.resolve("qwe"))).rejects.toThrow()
         expect(await against("asd")).eq("asd")
       })
 
+      test("Or with one awaited 2", async () => {
+        let against = sani(new OR(String, new AWAITED(Number)))
+
+        expect(against(Promise.resolve(3))).toBeInstanceOf(Promise)
+        expect(against("asd")).toBeInstanceOf(Promise)
+        expect(await against(Promise.resolve(3))).eq(3)
+        expect(async () => await against(4)).rejects.toThrow()
+        expect(async () => await against(Promise.resolve("qwe"))).rejects.toThrow()
+        expect(await against("asd")).eq("asd")
+      })
+
+
       test("Or with two awaited", async () => {
         let against = sani(new OR(new AWAITED(Number), new AWAITED(String)))
 
-        expect.assertions(6)
-
         expect(await against(Promise.resolve(3))).eq(3)
         expect(await against(Promise.resolve("qwe"))).eq("qwe")
         expect(async () => await against(Promise.resolve(false))).rejects.toThrow()
         expect(async () => await against(Promise.resolve(false))).rejects.toThrow()
         expect(async () => await against(4)).rejects.toThrow()
         expect(async () => await against("asd")).rejects.toThrow()
       })
-
-      test("And with awaited", async () => {
-
+    })
+
+    describe("Combinator with arbitrary instance of", () => {
+      test("And", async () => {
+        const against1 = sani(new AND(Promise, (p) => p.then((e) => e + 1)))
+
+        expect(against1(Promise.resolve(2))).toBeInstanceOf(Promise)
+        expect(await against1(Promise.resolve(2))).eq(3)
+        expect(await against1(Promise.resolve(3))).eq(4)
+        expect(() => against1(2)).toThrow()
+        expect(() => against1("asd")).toThrow()
+
+        const against2 = sani(new AND(Promise, (p) => p.then((e) => {if (e !== "") throw new Error()})))
+        expect(against2(Promise.resolve(""))).toBeInstanceOf(Promise)
+        expect(await against2(Promise.resolve(""))).eq(undefined)
+        expect(async () => await against2(Promise.resolve("asd"))).rejects.toThrow()
       })
     })
   })