@serenity-js/assertions 3.0.0-rc.2 → 3.0.0-rc.20

package/lib/expectations/containAtLeastOneItemThat.js.map

@@ -1 +1 @@
-{"version":3,"file":"containAtLeastOneItemThat.js","sourceRoot":"","sources":["../../src/expectations/containAtLeastOneItemThat.ts"],"names":[],"mappings":";;;AAAA,4CAAyH;AACzH,iDAAqD;AAErD,SAAgB,yBAAyB,CAAS,WAAqC;IACnF,OAAO,IAAI,yCAAyC,CAAC,WAAW,CAAC,CAAC;AACtE,CAAC;AAFD,8DAEC;AAED;;GAEG;AACH,MAAM,yCAA4D,SAAQ,kBAA+B;IACrG,YAA6B,WAA0C;QACnE,KAAK,CAAC,IAAA,cAAS,EAAC,uCAAwC,WAAY,EAAE,CAAC,CAAC;QAD/C,gBAAW,GAAX,WAAW,CAA+B;IAEvE,CAAC;IAED,UAAU,CAAC,KAAuB;QAC9B,OAAO,CAAC,MAAgB,EAAE,EAAE,CACxB,MAAM,CAAC,MAAM,KAAK,CAAC;YACf,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,wBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;YAC5E,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;iBACtE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,YAAY,qBAAc,CAAC;gBACrE,CAAC,CAAC,IAAI,qBAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC;gBAClE,CAAC,CAAC,IAAI,wBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,CACxE,CAAC;IAClB,CAAC;CACJ"}
+{"version":3,"file":"containAtLeastOneItemThat.js","sourceRoot":"","sources":["../../src/expectations/containAtLeastOneItemThat.ts"],"names":[],"mappings":";;;AAAA,4CAAwI;AAExI,SAAgB,yBAAyB,CAAS,WAAgC;IAC9E,OAAO,IAAI,yCAAyC,CAAC,WAAW,CAAC,CAAC;AACtE,CAAC;AAFD,8DAEC;AAED;;GAEG;AACH,MAAM,yCAAkD,SAAQ,kBAAqB;IAMjF,YAA6B,WAAgC;QACzD,KAAK,CACD,yCAAyC,CAAC,cAAc,CAAC,WAAW,CAAC,EACrE,KAAK,EAAE,KAAuB,EAAE,MAA4B,EAAE,EAAE;YAE5D,MAAM,KAAK,GAAa,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAEnD,IAAI,CAAE,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC/B,OAAO,IAAI,wBAAiB,CACxB,yCAAyC,CAAC,cAAc,CAAC,WAAW,CAAC,EACrE,SAAS,EACT,KAAK,CACR,CAAC;aACL;YAED,IAAI,OAA4C,CAAC;YAEjD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBAEtB,OAAO,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;gBAExD,IAAI,OAAO,YAAY,qBAAc,EAAE;oBACnC,OAAO,IAAI,qBAAc,CACrB,yCAAyC,CAAC,cAAc,CAAC,WAAW,CAAC,EACrE,OAAO,CAAC,QAAQ,EAChB,KAAK,CACR,CAAC;iBACL;aACJ;YAED,OAAO,IAAI,wBAAiB,CAAC,yCAAyC,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACjI,CAAC,CACJ,CAAC;QAhCuB,gBAAW,GAAX,WAAW,CAAqB;IAiC7D,CAAC;IArCO,MAAM,CAAC,cAAc,CAAC,WAA6B;QACvD,OAAO,IAAA,QAAC,EAAA,uCAAwC,WAAY,EAAE,CAAC;IACnE,CAAC;CAoCJ"}

package/lib/expectations/containItemsWhereEachItem.d.ts

@@ -1,2 +1,2 @@
 import { Expectation } from '@serenity-js/core';
-export declare function containItemsWhereEachItem<Actual>(expectation: Expectation<any, Actual>): Expectation<any, Actual[]>;
+export declare function containItemsWhereEachItem<Actual>(expectation: Expectation<Actual>): Expectation<Actual[]>;

package/lib/expectations/containItemsWhereEachItem.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.containItemsWhereEachItem = void 0;
 const core_1 = require("@serenity-js/core");
-const io_1 = require("@serenity-js/core/lib/io");
 function containItemsWhereEachItem(expectation) {
     return new ContainItemsWhereEachItemMeetsExpectation(expectation);
 }
@@ -12,16 +11,24 @@ exports.containItemsWhereEachItem = containItemsWhereEachItem;
  */
 class ContainItemsWhereEachItemMeetsExpectation extends core_1.Expectation {
     constructor(expectation) {
-        super((0, io_1.formatted) `contain items where each item does ${expectation}`);
+        super(ContainItemsWhereEachItemMeetsExpectation.descriptionFor(expectation), async (actor, actual) => {
+            const items = await actor.answer(actual);
+            if (!items || items.length === 0) {
+                return new core_1.ExpectationNotMet(ContainItemsWhereEachItemMeetsExpectation.descriptionFor(expectation), undefined, items);
+            }
+            let outcome;
+            for (const item of items) {
+                outcome = await actor.answer(expectation.isMetFor(item));
+                if (outcome instanceof core_1.ExpectationNotMet) {
+                    return new core_1.ExpectationNotMet(ContainItemsWhereEachItemMeetsExpectation.descriptionFor(expectation), outcome.expected, items);
+                }
+            }
+            return new core_1.ExpectationMet(ContainItemsWhereEachItemMeetsExpectation.descriptionFor(expectation), outcome.expected, items);
+        });
         this.expectation = expectation;
     }
-    answeredBy(actor) {
-        return (actual) => actual.length === 0
-            ? Promise.resolve(new core_1.ExpectationNotMet(this.toString(), undefined, actual))
-            : Promise.all(actual.map(item => this.expectation.answeredBy(actor)(item)))
-                .then(results => results.every(result => result instanceof core_1.ExpectationMet)
-                ? new core_1.ExpectationMet(this.toString(), results[0].expected, actual)
-                : new core_1.ExpectationNotMet(this.toString(), results[0].expected, actual));
+    static descriptionFor(expectation) {
+        return (0, core_1.d) `contain items where each item does ${expectation}`;
     }
 }
 //# sourceMappingURL=containItemsWhereEachItem.js.map

package/lib/expectations/containItemsWhereEachItem.js.map

@@ -1 +1 @@
-{"version":3,"file":"containItemsWhereEachItem.js","sourceRoot":"","sources":["../../src/expectations/containItemsWhereEachItem.ts"],"names":[],"mappings":";;;AAAA,4CAAyH;AACzH,iDAAqD;AAErD,SAAgB,yBAAyB,CAAS,WAAqC;IACnF,OAAO,IAAI,yCAAyC,CAAC,WAAW,CAAC,CAAC;AACtE,CAAC;AAFD,8DAEC;AAED;;GAEG;AACH,MAAM,yCAA4D,SAAQ,kBAA+B;IACrG,YAA6B,WAA0C;QACnE,KAAK,CAAC,IAAA,cAAS,EAAC,sCAAuC,WAAY,EAAE,CAAC,CAAC;QAD9C,gBAAW,GAAX,WAAW,CAA+B;IAEvE,CAAC;IAED,UAAU,CAAC,KAAuB;QAC9B,OAAO,CAAC,MAAgB,EAAE,EAAE,CACxB,MAAM,CAAC,MAAM,KAAK,CAAC;YACf,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,wBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;YAC5E,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;iBACtE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,YAAY,qBAAc,CAAC;gBACtE,CAAC,CAAC,IAAI,qBAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC;gBAClE,CAAC,CAAC,IAAI,wBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,CACxE,CAAC;IAClB,CAAC;CACJ"}
+{"version":3,"file":"containItemsWhereEachItem.js","sourceRoot":"","sources":["../../src/expectations/containItemsWhereEachItem.ts"],"names":[],"mappings":";;;AAAA,4CAAwI;AAExI,SAAgB,yBAAyB,CAAS,WAAgC;IAC9E,OAAO,IAAI,yCAAyC,CAAC,WAAW,CAAC,CAAC;AACtE,CAAC;AAFD,8DAEC;AAED;;GAEG;AACH,MAAM,yCAAkD,SAAQ,kBAAqB;IAMjF,YAA6B,WAAgC;QACzD,KAAK,CACD,yCAAyC,CAAC,cAAc,CAAC,WAAW,CAAC,EACrE,KAAK,EAAE,KAAuB,EAAE,MAA4B,EAAE,EAAE;YAE5D,MAAM,KAAK,GAAa,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAEnD,IAAI,CAAE,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC/B,OAAO,IAAI,wBAAiB,CACxB,yCAAyC,CAAC,cAAc,CAAC,WAAW,CAAC,EACrE,SAAS,EACT,KAAK,CACR,CAAC;aACL;YAED,IAAI,OAA4C,CAAC;YAEjD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBAEtB,OAAO,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;gBAExD,IAAI,OAAO,YAAY,wBAAiB,EAAE;oBACtC,OAAO,IAAI,wBAAiB,CACxB,yCAAyC,CAAC,cAAc,CAAC,WAAW,CAAC,EACrE,OAAO,CAAC,QAAQ,EAChB,KAAK,CACR,CAAC;iBACL;aACJ;YAED,OAAO,IAAI,qBAAc,CAAC,yCAAyC,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAC9H,CAAC,CACJ,CAAC;QAhCuB,gBAAW,GAAX,WAAW,CAAqB;IAiC7D,CAAC;IArCO,MAAM,CAAC,cAAc,CAAC,WAA6B;QACvD,OAAO,IAAA,QAAC,EAAA,sCAAuC,WAAY,EAAE,CAAC;IAClE,CAAC;CAoCJ"}

package/lib/expectations/index.d.ts

@@ -10,9 +10,9 @@ export * from './isBefore';
 export * from './isFalse';
 export * from './isGreaterThan';
 export * from './isLessThan';
+export * from './isPresent';
 export * from './isTrue';
 export * from './matches';
 export * from './not';
 export * from './or';
-export * from './property';
 export * from './startsWith';

package/lib/expectations/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -22,10 +26,10 @@ __exportStar(require("./isBefore"), exports);
 __exportStar(require("./isFalse"), exports);
 __exportStar(require("./isGreaterThan"), exports);
 __exportStar(require("./isLessThan"), exports);
+__exportStar(require("./isPresent"), exports);
 __exportStar(require("./isTrue"), exports);
 __exportStar(require("./matches"), exports);
 __exportStar(require("./not"), exports);
 __exportStar(require("./or"), exports);
-__exportStar(require("./property"), exports);
 __exportStar(require("./startsWith"), exports);
 //# sourceMappingURL=index.js.map

package/lib/expectations/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/expectations/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAAsB;AACtB,4CAA0B;AAC1B,8DAA4C;AAC5C,8DAA4C;AAC5C,6CAA2B;AAC3B,2CAAyB;AACzB,6CAA2B;AAC3B,4CAA0B;AAC1B,6CAA2B;AAC3B,4CAA0B;AAC1B,kDAAgC;AAChC,+CAA6B;AAC7B,2CAAyB;AACzB,4CAA0B;AAC1B,wCAAsB;AACtB,uCAAqB;AACrB,6CAA2B;AAC3B,+CAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/expectations/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB;AACtB,4CAA0B;AAC1B,8DAA4C;AAC5C,8DAA4C;AAC5C,6CAA2B;AAC3B,2CAAyB;AACzB,6CAA2B;AAC3B,4CAA0B;AAC1B,6CAA2B;AAC3B,4CAA0B;AAC1B,kDAAgC;AAChC,+CAA6B;AAC7B,8CAA4B;AAC5B,2CAAyB;AACzB,4CAA0B;AAC1B,wCAAsB;AACtB,uCAAqB;AACrB,+CAA6B"}

package/lib/expectations/isFalse.js.map

@@ -1 +1 @@
-{"version":3,"file":"isFalse.js","sourceRoot":"","sources":["../../src/expectations/isFalse.ts"],"names":[],"mappings":";;;AAAA,4CAAgD;AAEhD,qCAAkC;AAElC,SAAgB,OAAO;IACnB,OAAO,kBAAW,CAAC,EAAE,CAAU,aAAa,CAAC,CAAC,YAAY,CAAC,IAAA,eAAM,EAAC,KAAK,CAAC,CAAC,CAAC;AAC9E,CAAC;AAFD,0BAEC"}
+{"version":3,"file":"isFalse.js","sourceRoot":"","sources":["../../src/expectations/isFalse.ts"],"names":[],"mappings":";;;AAAA,4CAAgD;AAEhD,qCAAkC;AAElC,SAAgB,OAAO;IACnB,OAAO,kBAAW,CAAC,EAAE,CAAiB,aAAa,CAAC,CAAC,YAAY,CAAC,IAAA,eAAM,EAAC,KAAK,CAAC,CAAC,CAAC;AACrF,CAAC;AAFD,0BAEC"}

package/lib/expectations/isPresent.d.ts

@@ -0,0 +1,14 @@
+import { Expectation } from '@serenity-js/core';
+/**
+ * @desc
+ *  Expectation that the `actual` is not undefined or null.
+ *  Also, for `actual` implementing {@link @serenity-js/core/lib/screenplay~Optional}, that `Optional.isPresent()` returns an {@link @serenity-js/core/lib/screenplay~Answerable}
+ *  that resolves to `true`
+ *
+ * @returns {@serenity-js/core/lib/screenplay/questions~Expectation<Answerable<boolean>, Optional>}
+ *
+ * @see {@link @serenity-js/assertions~Ensure}
+ * @see {@link @serenity-js/core/lib/screenplay/questions~Check}
+ * @see {@link @serenity-js/core/lib/screenplay/interactions~Wait}
+ */
+export declare function isPresent<Actual>(): Expectation<Actual>;

package/lib/expectations/isPresent.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isPresent = void 0;
+const core_1 = require("@serenity-js/core");
+/**
+ * @desc
+ *  Expectation that the `actual` is not undefined or null.
+ *  Also, for `actual` implementing {@link @serenity-js/core/lib/screenplay~Optional}, that `Optional.isPresent()` returns an {@link @serenity-js/core/lib/screenplay~Answerable}
+ *  that resolves to `true`
+ *
+ * @returns {@serenity-js/core/lib/screenplay/questions~Expectation<Answerable<boolean>, Optional>}
+ *
+ * @see {@link @serenity-js/assertions~Ensure}
+ * @see {@link @serenity-js/core/lib/screenplay/questions~Check}
+ * @see {@link @serenity-js/core/lib/screenplay/interactions~Wait}
+ */
+function isPresent() {
+    return new IsPresent();
+}
+exports.isPresent = isPresent;
+class IsPresent extends core_1.Expectation {
+    static isOptional(value) {
+        return value !== undefined
+            && value !== null
+            && typeof value.isPresent === 'function';
+    }
+    static valueToCheck(actual, actor) {
+        if (IsPresent.isOptional(actual)) {
+            return actual;
+        }
+        return actor.answer(actual);
+    }
+    static async isPresent(value, actor) {
+        if (IsPresent.isOptional(value)) {
+            return actor.answer(value.isPresent());
+        }
+        return value !== undefined
+            && value !== null;
+    }
+    constructor() {
+        super('become present', async (actor, actual) => {
+            const value = await IsPresent.valueToCheck(actual, actor);
+            const result = await IsPresent.isPresent(value, actor);
+            return result
+                ? new core_1.ExpectationMet('become present', undefined, undefined)
+                : new core_1.ExpectationNotMet('become present', undefined, undefined);
+        });
+    }
+}
+//# sourceMappingURL=isPresent.js.map

package/lib/expectations/isPresent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isPresent.js","sourceRoot":"","sources":["../../src/expectations/isPresent.ts"],"names":[],"mappings":";;;AAAA,4CAA2H;AAE3H;;;;;;;;;;;GAWG;AACH,SAAgB,SAAS;IACrB,OAAO,IAAI,SAAS,EAAU,CAAC;AACnC,CAAC;AAFD,8BAEC;AAED,MAAM,SAAkB,SAAQ,kBAAmB;IACvC,MAAM,CAAC,UAAU,CAAC,KAAU;QAChC,OAAO,KAAK,KAAK,SAAS;eACnB,KAAK,KAAK,IAAI;eACd,OAAO,KAAK,CAAC,SAAS,KAAK,UAAU,CAAC;IACjD,CAAC;IAEO,MAAM,CAAC,YAAY,CAAI,MAAqB,EAAE,KAAuB;QACzE,IAAI,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC9B,OAAO,MAAM,CAAC;SACjB;QAED,OAAO,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,SAAS,CAAI,KAAoB,EAAE,KAAuB;QAC3E,IAAI,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YAC7B,OAAO,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;SAC1C;QAED,OAAO,KAAK,KAAK,SAAS;eACnB,KAAK,KAAK,IAAI,CAAC;IAC1B,CAAC;IAED;QACI,KAAK,CACD,gBAAgB,EAChB,KAAK,EAAE,KAAuB,EAAE,MAA0B,EAAE,EAAE;YAE1D,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAE1D,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAEvD,OAAO,MAAM;gBACT,CAAC,CAAC,IAAI,qBAAc,CAAC,gBAAgB,EAAE,SAAS,EAAE,SAAS,CAAC;gBAC5D,CAAC,CAAC,IAAI,wBAAiB,CAAC,gBAAgB,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QACxE,CAAC,CACJ,CAAC;IACN,CAAC;CACJ"}

package/lib/expectations/isTrue.js.map

@@ -1 +1 @@
-{"version":3,"file":"isTrue.js","sourceRoot":"","sources":["../../src/expectations/isTrue.ts"],"names":[],"mappings":";;;AAAA,4CAAgD;AAEhD,qCAAkC;AAElC,SAAgB,MAAM;IAClB,OAAO,kBAAW,CAAC,EAAE,CAAU,YAAY,CAAC,CAAC,YAAY,CAAC,IAAA,eAAM,EAAC,IAAI,CAAC,CAAC,CAAC;AAC5E,CAAC;AAFD,wBAEC"}
+{"version":3,"file":"isTrue.js","sourceRoot":"","sources":["../../src/expectations/isTrue.ts"],"names":[],"mappings":";;;AAAA,4CAAgD;AAEhD,qCAAkC;AAElC,SAAgB,MAAM;IAClB,OAAO,kBAAW,CAAC,EAAE,CAAiB,YAAY,CAAC,CAAC,YAAY,CAAC,IAAA,eAAM,EAAC,IAAI,CAAC,CAAC,CAAC;AACnF,CAAC;AAFD,wBAEC"}

package/lib/expectations/matches.d.ts

@@ -1,2 +1,2 @@
 import { Answerable, Expectation } from '@serenity-js/core';
-export declare function matches(expected: Answerable<RegExp>): Expectation<RegExp, string>;
+export declare function matches(expected: Answerable<RegExp>): Expectation<string>;

package/lib/expectations/not.d.ts

@@ -1,2 +1,2 @@
 import { Expectation } from '@serenity-js/core';
-export declare function not<Expected, Actual>(assertion: Expectation<Expected, Actual>): Expectation<Expected, Actual>;
+export declare function not<Actual>(assertion: Expectation<Actual>): Expectation<Actual>;

package/lib/expectations/not.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.not = void 0;
 const core_1 = require("@serenity-js/core");
-const tiny_types_1 = require("tiny-types");
 function not(assertion) {
     return new Not(assertion);
 }
@@ -12,7 +11,13 @@ exports.not = not;
  */
 class Not extends core_1.Expectation {
     constructor(expectation) {
-        super(Not.flipped(expectation.toString()));
+        super(Not.flipped(expectation.toString()), async (actor, actual) => {
+            const subject = Not.flipped(expectation.toString());
+            const outcome = await actor.answer(expectation.isMetFor(actual));
+            return outcome instanceof core_1.ExpectationNotMet
+                ? new core_1.ExpectationMet(subject, outcome.expected, outcome.actual)
+                : new core_1.ExpectationNotMet(subject, outcome.expected, outcome.actual);
+        });
         this.expectation = expectation;
     }
     static flipped(message) {
@@ -20,11 +25,5 @@ class Not extends core_1.Expectation {
             ? message.slice(4)
             : `not ${message}`;
     }
-    answeredBy(actor) {
-        return (actual) => this.expectation.answeredBy(actor)(actual)
-            .then((outcome) => (0, tiny_types_1.match)(outcome)
-            .when(core_1.ExpectationMet, o => new core_1.ExpectationNotMet(this.subject, o.expected, o.actual))
-            .else(o => new core_1.ExpectationMet(this.subject, o.expected, o.actual)));
-    }
 }
 //# sourceMappingURL=not.js.map

package/lib/expectations/not.js.map

@@ -1 +1 @@
-{"version":3,"file":"not.js","sourceRoot":"","sources":["../../src/expectations/not.ts"],"names":[],"mappings":";;;AAAA,4CAAyH;AACzH,2CAAmC;AAEnC,SAAgB,GAAG,CAAmB,SAAwC;IAC1E,OAAO,IAAI,GAAG,CAAmB,SAAS,CAAC,CAAC;AAChD,CAAC;AAFD,kBAEC;AAED;;GAEG;AACH,MAAM,GAAsB,SAAQ,kBAA6B;IAO7D,YAA6B,WAA0C;QACnE,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QADlB,gBAAW,GAAX,WAAW,CAA+B;IAEvE,CAAC;IARO,MAAM,CAAC,OAAO,CAAC,OAAe;QAClC,OAAO,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC;YAC7B,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;YAClB,CAAC,CAAC,OAAQ,OAAQ,EAAE,CAAC;IAC7B,CAAC;IAMD,UAAU,CAAC,KAAuB;QAE9B,OAAO,CAAC,MAAW,EAAE,EAAE,CACnB,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;aACrC,IAAI,CAAC,CAAC,OAA6C,EAAE,EAAE,CACpD,IAAA,kBAAK,EAA6E,OAAO,CAAC;aACrF,IAAI,CAAC,qBAAc,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,wBAAiB,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;aACpF,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,qBAAc,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACxF,CAAC;CACJ"}
+{"version":3,"file":"not.js","sourceRoot":"","sources":["../../src/expectations/not.ts"],"names":[],"mappings":";;;AAAA,4CAAiH;AAEjH,SAAgB,GAAG,CAAS,SAA8B;IACtD,OAAO,IAAI,GAAG,CAAS,SAAS,CAAC,CAAC;AACtC,CAAC;AAFD,kBAEC;AAED;;GAEG;AACH,MAAM,GAAY,SAAQ,kBAAmB;IAOzC,YAA6B,WAAgC;QACzD,KAAK,CACD,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,EACnC,KAAK,EAAE,KAAuB,EAAE,MAA0B,EAAE,EAAE;YAC1D,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;YAEpD,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;YAEjE,OAAO,OAAO,YAAY,wBAAiB;gBACvC,CAAC,CAAC,IAAI,qBAAc,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC;gBAC/D,CAAC,CAAC,IAAI,wBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3E,CAAC,CACJ,CAAC;QAZuB,gBAAW,GAAX,WAAW,CAAqB;IAa7D,CAAC;IAnBO,MAAM,CAAC,OAAO,CAAC,OAAe;QAClC,OAAO,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC;YAC7B,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;YAClB,CAAC,CAAC,OAAQ,OAAQ,EAAE,CAAC;IAC7B,CAAC;CAgBJ"}

package/lib/expectations/or.d.ts

@@ -1,2 +1,2 @@
 import { Expectation } from '@serenity-js/core';
-export declare function or<Actual>(...assertions: Array<Expectation<any, Actual>>): Expectation<any, Actual>;
+export declare function or<Actual>(...assertions: Array<Expectation<Actual>>): Expectation<Actual>;

package/lib/expectations/or.js

@@ -11,20 +11,25 @@ exports.or = or;
  */
 class Or extends core_1.Expectation {
     constructor(expectations) {
-        super(expectations
-            .map(assertion => assertion.toString())
-            .join(Or.Separator));
+        super(Or.descriptionFor(expectations), async (actor, actual) => {
+            if (!expectations || expectations.length === 0) {
+                throw new core_1.LogicError(`No expectations provided to or()`);
+            }
+            let outcome;
+            for (const expectation of expectations) {
+                outcome = await actor.answer(expectation.isMetFor(actual));
+                if (outcome instanceof core_1.ExpectationMet) {
+                    return outcome;
+                }
+            }
+            return new core_1.ExpectationNotMet(Or.descriptionFor(expectations), outcome.expected, outcome.actual);
+        });
         this.expectations = expectations;
     }
-    answeredBy(actor) {
-        return (actual) => this.expectations.reduce((previous, current) => previous.then((outcomesSoFar) => current.answeredBy(actor)(actual)
-            .then(outcome => outcomesSoFar.concat(outcome))), Promise.resolve([])).
-            then((outcomes) => {
-            const unmetExpectations = outcomes.filter(outcome => outcome instanceof core_1.ExpectationNotMet), message = outcomes.map(outcome => outcome.message).join(Or.Separator);
-            return unmetExpectations.length === this.expectations.length
-                ? new core_1.ExpectationNotMet(message, outcomes[0].expected, outcomes[0].actual)
-                : new core_1.ExpectationMet(message, outcomes[0].expected, outcomes[0].actual);
-        });
+    static descriptionFor(expectations) {
+        return expectations
+            .map(expectation => expectation.toString())
+            .join(Or.Separator);
     }
 }
 Or.Separator = ' or ';

package/lib/expectations/or.js.map

@@ -1 +1 @@
-{"version":3,"file":"or.js","sourceRoot":"","sources":["../../src/expectations/or.ts"],"names":[],"mappings":";;;AAAA,4CAAyH;AAEzH,SAAgB,EAAE,CAAS,GAAG,UAA2C;IACrE,OAAO,IAAI,EAAE,CAAC,UAAU,CAAC,CAAC;AAC9B,CAAC;AAFD,gBAEC;AAED;;GAEG;AACH,MAAM,EAAW,SAAQ,kBAAwB;IAG7C,YAA6B,YAA6C;QACtE,KAAK,CAAC,YAAY;aACb,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;aACtC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;QAHA,iBAAY,GAAZ,YAAY,CAAiC;IAI1E,CAAC;IAED,UAAU,CAAC,KAAuB;QAE9B,OAAO,CAAC,MAAW,EAAE,EAAE,CACnB,IAAI,CAAC,YAAY,CAAC,MAAM,CACpB,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,CAClB,QAAQ,CAAC,IAAI,CAAC,CAAC,aAAqD,EAAE,EAAE,CACpE,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;aAC5B,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CACtD,EACL,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CACtB;YACD,IAAI,CAAC,CAAC,QAAgD,EAAE,EAAE;YAEtD,MACI,iBAAiB,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,YAAY,wBAAiB,CAAC,EACpF,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;YAE1E,OAAO,iBAAiB,CAAC,MAAM,KAAK,IAAI,CAAC,YAAY,CAAC,MAAM;gBACxD,CAAC,CAAC,IAAI,wBAAiB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;gBAC1E,CAAC,CAAC,IAAI,qBAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAChF,CAAC,CAAC,CAAC;IACX,CAAC;;AA7BuB,YAAS,GAAG,MAAM,CAAC"}
+{"version":3,"file":"or.js","sourceRoot":"","sources":["../../src/expectations/or.ts"],"names":[],"mappings":";;;AAAA,4CAAiJ;AAEjJ,SAAgB,EAAE,CAAS,GAAG,UAAsC;IAChE,OAAO,IAAI,EAAE,CAAC,UAAU,CAAC,CAAC;AAC9B,CAAC;AAFD,gBAEC;AAED;;GAEG;AACH,MAAM,EAAW,SAAQ,kBAAmB;IASxC,YAA6B,YAAwC;QACjE,KAAK,CACD,EAAE,CAAC,cAAc,CAAC,YAAY,CAAC,EAC/B,KAAK,EAAE,KAAuB,EAAE,MAA0B,EAAE,EAAE;YAC1D,IAAI,CAAE,YAAY,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC7C,MAAM,IAAI,iBAAU,CAAC,kCAAkC,CAAC,CAAC;aAC5D;YAED,IAAI,OAA4C,CAAC;YACjD,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;gBACpC,OAAO,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;gBAE3D,IAAI,OAAO,YAAY,qBAAc,EAAE;oBACnC,OAAO,OAAO,CAAC;iBAClB;aACJ;YAED,OAAO,IAAI,wBAAiB,CACxB,EAAE,CAAC,cAAc,CAAC,YAAY,CAAC,EAC/B,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,MAAM,CACjB,CAAC;QACN,CAAC,CACJ,CAAC;QAvBuB,iBAAY,GAAZ,YAAY,CAA4B;IAwBrE,CAAC;IA9BO,MAAM,CAAC,cAAc,CAAI,YAAmC;QAChE,OAAO,YAAY;aACd,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;aAC1C,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;IAC5B,CAAC;;AANuB,YAAS,GAAG,MAAM,CAAC"}

package/lib/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAyB;AACzB,iDAA+B;AAC/B,0CAAuD,CAAC,gFAAgF;AAA/H,6FAAA,KAAK,OAAA;AAAE,mGAAA,WAAW,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,iDAA+B;AAC/B,0CAAuD,CAAC,gFAAgF;AAA/H,6FAAA,KAAK,OAAA;AAAE,mGAAA,WAAW,OAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serenity-js/assertions",
-  "version": "3.0.0-rc.2",
+  "version": "3.0.0-rc.20",
   "description": "Screenplay-style assertion library",
   "author": {
     "name": "Jan Molak",
@@ -29,13 +29,14 @@
     "clean": "rimraf .nyc_output lib target",
     "lint": "eslint --ext ts --config ../../.eslintrc.yml .",
     "lint:fix": "npm run lint -- --fix",
-    "test": "nyc --report-dir ../../target/coverage/assertions mocha --config ../../.mocharc.yml 'spec/**/*.spec.*'",
+    "test": "nyc mocha --config ../../.mocharc.yml 'spec/**/*.spec.*'",
     "compile": "tsc --project tsconfig.json",
     "site": "esdoc -c .esdoc.js"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/serenity-js/serenity-js.git"
+    "url": "https://github.com/serenity-js/serenity-js.git",
+    "directory": "packages/assertions"
   },
   "bugs": {
     "url": "https://github.com/serenity-js/serenity-js/issues"
@@ -45,39 +46,17 @@
     "npm": "^6 || ^7 || ^8"
   },
   "dependencies": {
-    "@serenity-js/core": "3.0.0-rc.1",
-    "tiny-types": "^1.16.1"
+    "@serenity-js/core": "3.0.0-rc.20",
+    "tiny-types": "^1.18.4"
   },
   "devDependencies": {
     "@documentation/esdoc-template": "3.0.0",
     "@integration/testing-tools": "3.0.0",
-    "@types/chai": "^4.3.0",
-    "@types/mocha": "^9.0.0",
-    "mocha": "^9.1.3",
-    "ts-node": "^10.4.0",
-    "typescript": "^4.5.2"
+    "@types/chai": "^4.3.1",
+    "@types/mocha": "^9.1.1",
+    "mocha": "^10.0.0",
+    "ts-node": "10.8.0",
+    "typescript": "^4.7.4"
   },
-  "nyc": {
-    "include": [
-      "src/**/*.ts"
-    ],
-    "exclude": [
-      "src/**/*.d.ts",
-      "lib",
-      "node_modules",
-      "spec"
-    ],
-    "extension": [
-      ".ts"
-    ],
-    "require": [
-      "ts-node/register"
-    ],
-    "reporter": [
-      "json"
-    ],
-    "cache": true,
-    "all": true
-  },
-  "gitHead": "944ff400a3766e75980aea5d3b401d8acca7c6d8"
+  "gitHead": "105a84c6ab140c06e38d328274473a32b290080d"
 }

package/src/Ensure.ts

@@ -3,16 +3,17 @@ import {
     AnswersQuestions,
     AssertionError,
     CollectsArtifacts,
+    d,
     Expectation,
     ExpectationMet,
     ExpectationNotMet,
     ExpectationOutcome,
+    f,
     Interaction,
     LogicError,
     RuntimeError,
     UsesAbilities,
 } from '@serenity-js/core';
-import { formatted } from '@serenity-js/core/lib/io';
 import { inspected } from '@serenity-js/core/lib/io/inspected';
 import { Artifact, AssertionReport, Name } from '@serenity-js/core/lib/model';
 import { match } from 'tiny-types';
@@ -68,7 +69,7 @@ export class Ensure<Actual> extends Interaction {
      *
      * @returns {Ensure<A>}
      */
-    static that<A>(actual: Answerable<A>, expectation: Expectation<any, A>): Ensure<A> {
+    static that<A>(actual: Answerable<A>, expectation: Expectation<A>): Ensure<A> {
         return new Ensure(actual, expectation);
     }
 
@@ -96,24 +97,19 @@ export class Ensure<Actual> extends Interaction {
      * @see {@link @serenity-js/core/lib/screenplay/actor~CollectsArtifacts}
      * @see {@link @serenity-js/core/lib/screenplay/actor~AnswersQuestions}
      */
-    performAs(actor: UsesAbilities & AnswersQuestions & CollectsArtifacts): Promise<void> {
-        return Promise.all([
-            actor.answer(this.actual),
-            actor.answer(this.expectation),
-        ]).then(([ actual, expectation ]) =>
-            expectation(actual).then(outcome =>
-                match<ExpectationOutcome<unknown, Actual>, void>(outcome)
-                    .when(ExpectationNotMet, o => {
-                        actor.collect(this.artifactFrom(o.expected, o.actual), new Name(`Assertion Report`));
+    async performAs(actor: UsesAbilities & AnswersQuestions & CollectsArtifacts): Promise<void> {
+        const outcome = await actor.answer(this.expectation.isMetFor(this.actual));
 
-                        throw this.errorForOutcome(o);
-                    })
-                    .when(ExpectationMet, _ => void 0)
-                    .else(o => {
-                        throw new LogicError(formatted `An Expectation should return an instance of an ExpectationOutcome, not ${ o }`);
-                    }),
-            ),
-        );
+        return match<ExpectationOutcome<unknown, Actual>, void>(outcome)
+            .when(ExpectationNotMet, o => {
+                actor.collect(this.artifactFrom(o.expected, o.actual), new Name(`Assertion Report`));
+
+                throw this.errorForOutcome(o);
+            })
+            .when(ExpectationMet, _ => void 0)
+            .else(o => {
+                throw new LogicError(f`Expectation#isMetFor(actual) should return an instance of an ExpectationOutcome, not ${ o }`);
+            });
     }
 
     /**
@@ -123,7 +119,7 @@ export class Ensure<Actual> extends Interaction {
      * @returns {string}
      */
     toString(): string {
-        return formatted `#actor ensures that ${ this.actual } does ${ this.expectation }`;
+        return d`#actor ensures that ${ this.actual } does ${ this.expectation }`;
     }
 
     /**
@@ -167,7 +163,7 @@ export class Ensure<Actual> extends Interaction {
      */
     protected asAssertionError(outcome: ExpectationOutcome<any, Actual>): AssertionError {
         return new AssertionError(
-            `Expected ${ formatted`${ this.actual }` } to ${ outcome.message }`,
+            `Expected ${ d`${ this.actual }` } to ${ outcome.message }`,
             outcome.expected,
             outcome.actual,
         );

package/src/expectations/and.ts

@@ -1,29 +1,30 @@
-import { AnswersQuestions, Expectation, ExpectationNotMet, ExpectationOutcome } from '@serenity-js/core';
+import { Answerable, AnswersQuestions, Expectation, ExpectationNotMet } from '@serenity-js/core';
 import { match } from 'tiny-types';
 
-export function and<Actual>(...expectations: Array<Expectation<any, Actual>>): Expectation<any, Actual> {
+export function and<Actual>(...expectations: Array<Expectation<Actual>>): Expectation<Actual> {
     return new And(expectations);
 }
 
 /**
  * @package
  */
-class And<Actual> extends Expectation<any, Actual> {
-    constructor(private readonly expectations: Array<Expectation<any, Actual>>) {
-        super(expectations.map(assertion => assertion.toString()).join(' and '));
-    }
-
-    answeredBy(actor: AnswersQuestions): (actual: Actual) => Promise<ExpectationOutcome<any, Actual>> {
+class And<Actual> extends Expectation<Actual> {
+    private static readonly Separator = ' and ';
 
-        return (actual: any) =>
-            this.expectations.reduce(
-                (previous, current) =>
-                    previous.then(outcome =>
-                        match(outcome)
-                            .when(ExpectationNotMet, o => o)
-                            .else(_ => current.answeredBy(actor)(actual)),
-                    ),
-                Promise.resolve(void 0),
-            );
+    constructor(private readonly expectations: Array<Expectation<Actual>>) {
+        super(
+            expectations.map(expectation => expectation.toString()).join(And.Separator),
+            (actor: AnswersQuestions, actual: Answerable<Actual>) => {
+                return expectations.reduce(
+                    (previous, current) =>
+                        previous.then(outcome =>
+                            match(outcome)
+                                .when(ExpectationNotMet, o => o)
+                                .else(_ => actor.answer(current.isMetFor(actual))),
+                        ),
+                    Promise.resolve(void 0),
+                );
+            }
+        );
     }
 }

package/src/expectations/contain.ts

@@ -1,7 +1,7 @@
 import { Answerable, Expectation } from '@serenity-js/core';
 import { equal } from 'tiny-types/lib/objects';
 
-export function contain<Item>(expected: Answerable<Item>): Expectation<Item, Item[]> {
+export function contain<Item>(expected: Answerable<Item>): Expectation<Item[]> {
     return Expectation.thatActualShould<Item, Item[]>('contain', expected)
         .soThat((actualValue, expectedValue) => !! ~ actualValue.findIndex(av => equal(av, expectedValue)));
 }

package/src/expectations/containAtLeastOneItemThat.ts

@@ -1,26 +1,50 @@
-import { AnswersQuestions, Expectation, ExpectationMet, ExpectationNotMet, ExpectationOutcome } from '@serenity-js/core';
-import { formatted } from '@serenity-js/core/lib/io';
+import { Answerable, AnswersQuestions, d, Expectation, ExpectationMet, ExpectationNotMet, ExpectationOutcome } from '@serenity-js/core';
 
-export function containAtLeastOneItemThat<Actual>(expectation: Expectation<any, Actual>): Expectation<any, Actual[]> {
+export function containAtLeastOneItemThat<Actual>(expectation: Expectation<Actual>): Expectation<Actual[]> {
     return new ContainAtLeastOneItemThatMeetsExpectation(expectation);
 }
 
 /**
  * @package
  */
-class ContainAtLeastOneItemThatMeetsExpectation<Expected, Actual> extends Expectation<Expected, Actual[]> {
-    constructor(private readonly expectation: Expectation<Expected, Actual>) {
-        super(formatted `contain at least one item that does ${ expectation }`);
+class ContainAtLeastOneItemThatMeetsExpectation<Actual> extends Expectation<Actual[]> {
+
+    private static descriptionFor(expectation: Expectation<any>) {
+        return d`contain at least one item that does ${ expectation }`;
     }
 
-    answeredBy(actor: AnswersQuestions): (actual: Actual[]) => Promise<ExpectationOutcome<Expected, Actual[]>> {
-        return (actual: Actual[]) =>
-            actual.length === 0
-                ? Promise.resolve(new ExpectationNotMet(this.toString(), undefined, actual))
-                : Promise.all(actual.map(item => this.expectation.answeredBy(actor)(item)))
-                    .then(results => results.some(result => result instanceof ExpectationMet)
-                        ? new ExpectationMet(this.toString(), results[0].expected, actual)
-                        : new ExpectationNotMet(this.toString(), results[0].expected, actual),
+    constructor(private readonly expectation: Expectation<Actual>) {
+        super(
+            ContainAtLeastOneItemThatMeetsExpectation.descriptionFor(expectation),
+            async (actor: AnswersQuestions, actual: Answerable<Actual[]>) => {
+
+                const items: Actual[] = await actor.answer(actual);
+
+                if (! items || items.length === 0) {
+                    return new ExpectationNotMet(
+                        ContainAtLeastOneItemThatMeetsExpectation.descriptionFor(expectation),
+                        undefined,
+                        items,
                     );
+                }
+
+                let outcome: ExpectationOutcome<unknown, Actual>;
+
+                for (const item of items) {
+
+                    outcome = await actor.answer(expectation.isMetFor(item))
+
+                    if (outcome instanceof ExpectationMet) {
+                        return new ExpectationMet(
+                            ContainAtLeastOneItemThatMeetsExpectation.descriptionFor(expectation),
+                            outcome.expected,
+                            items
+                        );
+                    }
+                }
+
+                return new ExpectationNotMet(ContainAtLeastOneItemThatMeetsExpectation.descriptionFor(expectation), outcome.expected, items);
+            }
+        );
     }
 }