@serenity-js/core 2.33.1 → 3.0.0-rc.11

package/lib/screenplay/Question.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Question = void 0;
-const collections_1 = require("../io/collections");
+const io_1 = require("../io");
+const Interaction_1 = require("./Interaction");
 /**
  * @desc
  *  Enables the {@link Actor} to query the system under test.
@@ -52,15 +53,6 @@ const collections_1 = require("../io/collections");
  * @abstract
  */
 class Question {
-    /**
-     * @param {string} subject
-     *  The subject of this question
-     *
-     * @protected
-     */
-    constructor(subject) {
-        this.subject = subject;
-    }
     /**
      * @desc
      *  Factory method that simplifies the process of defining custom questions.
@@ -77,7 +69,7 @@ class Question {
      * @returns {Question<R>}
      */
     static about(description, body) {
-        return new AnonymousQuestion(description, body);
+        return Question.createAdapter(new QuestionStatement(description, body));
     }
     /**
      * @desc
@@ -93,115 +85,155 @@ class Question {
     static isAQuestion(maybeQuestion) {
         return !!maybeQuestion && !!maybeQuestion.answeredBy;
     }
-    /**
-     * @desc
-     *  Describes the subject of this {@link Question}.
-     *
-     * @returns {string}
-     */
-    toString() {
-        return this.subject;
+    static createAdapter(statement) {
+        return new Proxy(() => statement, {
+            get(currentStatement, key, receiver) {
+                const target = currentStatement();
+                if (key === Symbol.toPrimitive) {
+                    return (_hint) => {
+                        return target.toString();
+                    };
+                }
+                if (key in target) {
+                    return Reflect.get(target, key);
+                }
+                if (key === 'then') {
+                    return;
+                }
+                const originalSubject = (0, io_1.f) `${target}`;
+                const fieldDescription = (typeof key === 'number' || /^\d+$/.test(String(key)))
+                    ? `[${String(key)}]` // array index
+                    : `.${String(key)}`; // field/method name
+                return Question.about(`${originalSubject}${fieldDescription}`, async (actor) => {
+                    const answer = await actor.answer(target);
+                    if (!isDefined(answer)) {
+                        return undefined; // eslint-disable-line unicorn/no-useless-undefined
+                    }
+                    const field = answer[key];
+                    return typeof field === 'function'
+                        ? field.bind(answer)
+                        : field;
+                });
+            },
+            set(currentStatement, key, value, receiver) {
+                const target = currentStatement();
+                return Reflect.set(target, key, value);
+            },
+            apply(currentStatement, _thisArgument, parameters) {
+                const target = currentStatement();
+                const parameterDescriptions = [
+                    '(',
+                    parameters.map(p => (0, io_1.f) `${p}`).join(', '),
+                    ')'
+                ].join('');
+                return Question.about(target.toString() + parameterDescriptions, async (actor) => {
+                    const params = [];
+                    for (const parameter of parameters) {
+                        const answered = await actor.answer(parameter);
+                        params.push(answered);
+                    }
+                    const field = await actor.answer(target);
+                    return typeof field === 'function'
+                        ? field(...params)
+                        : field;
+                });
+            },
+            getPrototypeOf(currentStatement) {
+                return Reflect.getPrototypeOf(currentStatement());
+            },
+        });
+    }
+    as(mapping) {
+        return Question.about((0, io_1.f) `${this}.as(${mapping})`, async (actor) => {
+            const answer = (await actor.answer(this));
+            return mapping(answer);
+        });
+    }
+}
+exports.Question = Question;
+class QuestionStatement extends Interaction_1.Interaction {
+    constructor(subject, body) {
+        super();
+        this.subject = subject;
+        this.body = body;
     }
     /**
      * @desc
-     *  Changes the description of this question's subject.
+     *  Returns a Question that resolves to `true` if resolving the {@link QuestionStatement}
+     *  returns a value other than `null` or `undefined` and doesn't throw errors.
      *
-     * @param {string} subject
-     * @returns {Question<T>}
+     * @returns {Question<Promise<boolean>>}
      */
+    isPresent() {
+        return new IsPresent((0, io_1.f) `${this}.isPresent()`, this.body);
+    }
+    async answeredBy(actor) {
+        const result = await this.body(actor);
+        return isDefined(result)
+            ? result
+            : undefined;
+    }
+    async performAs(actor) {
+        await this.body(actor);
+    }
     describedAs(subject) {
         this.subject = subject;
         return this;
     }
-    /**
-     * @desc
-     *  Creates a new {@link Question}, which value is a result of applying the `mapping`
-     *  function to the value of this {@link Question}.
-     *
-     * @example <caption>Mapping a Question<Promise<string>> to Question<Promise<number>></caption>
-     *  import { Question, replace, toNumber } from '@serenity-js/core';
-     *
-     *  Question.about('the price of some item', actor => '$3.99')
-     *      .map(replace('$', ''))
-     *      .map(toNumber)
-     *
-     *  // => Question<Promise<number>>
-     *  //      3.99
-     *
-     * @example <caption>Mapping all items of Question<string[]> to Question<Promise<number>></caption>
-     *  import { Question, trim } from '@serenity-js/core';
-     *
-     *  Question.about('things to do', actor => [ ' walk the dog  ', '  read a book  ' ])
-     *      .map(trim())
-     *
-     *  // => Question<Promise<string[]>>
-     *  //      [ 'walk the dog', 'read a book' ]
-     *
-     * @example <caption>Using a custom mapping function</caption>
-     *  import { Question } from '@serenity-js/core';
-     *
-     *  Question.about('normalised percentages', actor => [ 0.1, 0.3, 0.6 ])
-     *      .map((actor: AnswersQuestions) => (value: number) => value * 100)
-     *
-     *  // => Question<Promise<number[]>>
-     *  //      [ 10, 30, 60 ]
-     *
-     * @example <caption>Extracting values from LastResponse.body()</caption>
-     *  import { Question } from '@serenity-js/core';
-     *  import { LastResponse } from '@serenity-js/rest';
-     *
-     *  interface UserDetails {
-     *      id: number;
-     *      name: string;
-     *  }
-     *
-     *  LastResponse.body<UserDetails>().map(actor => details => details.id)
-     *
-     *  // => Question<number>
-     *
-     * @param {function(value: A, index?: number): Promise<O> | O} mapping
-     *  A mapping function that receives a value of type `<A>`, which is either:
-     *  - an answer to the original question, if the question is defined as `Question<Promise<A>>` or `Question<A>`
-     *  - or, if the question is defined as `Question<Promise<Mappable<A>>`, `Question<Mappable<A>>` - each item of the {@link Mappable} collection,
-     *
-     * @returns {Question<Promise<Mapped>>}
-     *  A new Question which value is a result of applying the `mapping` function
-     *  to the value of the current question, so that:
-     *  - if the answer to the current question is a `Mappable<A>`, the result becomes `Question<Promise<O[]>>`
-     *  - if the answer is a value `<A>` or `Promise<A>`, the result becomes `Question<Promise<O>>`
-     *
-     * @see {@link AnswerMappingFunction}
-     * @see {@link Mappable}
-     */
-    map(mapping) {
-        return Question.about(this.subject, actor => actor.answer(this).then(value => ((0, collections_1.isMappable)(value)
-            ? Promise.all((value).map(mapping(actor)))
-            : mapping(actor)(value))));
+    toString() {
+        return this.subject;
+    }
+    as(mapping) {
+        return Question.about((0, io_1.f) `${this}.as(${mapping})`, async (actor) => {
+            const answer = await actor.answer(this);
+            if (!isDefined(answer)) {
+                return undefined; // eslint-disable-line unicorn/no-useless-undefined
+            }
+            return mapping(answer);
+        });
     }
 }
-exports.Question = Question;
 /**
  * @package
  */
-class AnonymousQuestion extends Question {
-    constructor(description, body) {
-        super(description);
-        this.description = description;
+class IsPresent extends Question {
+    constructor(subject, body) {
+        super();
+        this.subject = subject;
         this.body = body;
     }
-    answeredBy(actor) {
-        return this.body(actor);
+    async answeredBy(actor) {
+        try {
+            const answer = await this.body(actor);
+            if (answer === undefined || answer === null) {
+                return false;
+            }
+            if (this.isOptional(answer)) {
+                return await actor.answer(answer.isPresent());
+            }
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    isOptional(maybeOptional) {
+        return typeof maybeOptional === 'object'
+            && Reflect.has(maybeOptional, 'isPresent');
     }
-    /**
-     * Changes the description of this question's subject
-     * and produces a new instance without mutating the original one.
-     *
-     * @param {string} subject
-     * @returns {Question<T>}
-     */
     describedAs(subject) {
         this.subject = subject;
         return this;
     }
+    toString() {
+        return this.subject;
+    }
+}
+/**
+ * @package
+ */
+function isDefined(value) {
+    return value !== undefined
+        && value !== null;
 }
 //# sourceMappingURL=Question.js.map

package/lib/screenplay/Question.js.map

@@ -1 +1 @@
-{"version":3,"file":"Question.js","sourceRoot":"","sources":["../../src/screenplay/Question.ts"],"names":[],"mappings":";;;AAAA,mDAAyD;AAIzD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AACH,MAAsB,QAAQ;IAE1B;;;;;OAKG;IACH,YAAgC,OAAe;QAAf,YAAO,GAAP,OAAO,CAAQ;IAC/C,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACH,MAAM,CAAC,KAAK,CAAI,WAAmB,EAAE,IAAoD;QACrF,OAAO,IAAI,iBAAiB,CAAI,WAAW,EAAE,IAAI,CAAC,CAAC;IACvD,CAAC;IAED;;;;;;;;;;OAUG;IACH,MAAM,CAAC,WAAW,CAAI,aAAsB;QACxC,OAAO,CAAC,CAAE,aAAa,IAAI,CAAC,CAAG,aAAqB,CAAC,UAAU,CAAC;IACpE,CAAC;IAED;;;;;OAKG;IACH,QAAQ;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAED;;;;;;OAMG;IACH,WAAW,CAAC,OAAe;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAEvB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2DG;IACH,GAAG,CAAI,OAAsE;QACzE,OAAO,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CACxC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAC5B,CAAC,IAAA,wBAAU,EAAC,KAAK,CAAC;YACd,CAAC,CAAC,OAAO,CAAC,GAAG,CAAE,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAA+B,CAAC;YACzE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,KAA4C,CAAC,CACxC,CAC7B,CAC+B,CAAC;IACzC,CAAC;CAMJ;AA/ID,4BA+IC;AA0BD;;GAEG;AACH,MAAM,iBAAqB,SAAQ,QAAW;IAC1C,YAAoB,WAAmB,EAAU,IAAoD;QACjG,KAAK,CAAC,WAAW,CAAC,CAAC;QADH,gBAAW,GAAX,WAAW,CAAQ;QAAU,SAAI,GAAJ,IAAI,CAAgD;IAErG,CAAC;IAED,UAAU,CAAC,KAAuC;QAC9C,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;IAED;;;;;;OAMG;IACH,WAAW,CAAC,OAAe;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAEvB,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ"}
+{"version":3,"file":"Question.js","sourceRoot":"","sources":["../../src/screenplay/Question.ts"],"names":[],"mappings":"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"}

package/lib/screenplay/actor/Actor.js

@@ -89,10 +89,10 @@ class Actor {
      */
     answer(answerable) {
         function isAPromise(v) {
-            return !!v.then;
+            return Object.prototype.hasOwnProperty.call(v, 'then');
         }
         function isDefined(v) {
-            return !(answerable === undefined || answerable === null);
+            return !(v === undefined || v === null);
         }
         if (isDefined(answerable) && isAPromise(answerable)) {
             return answerable;

package/lib/screenplay/actor/Actor.js.map

@@ -1 +1 @@
-{"version":3,"file":"Actor.js","sourceRoot":"","sources":["../../../src/screenplay/actor/Actor.ts"],"names":[],"mappings":";;;AAAA,yCAAwE;AACxE,yCAAgE;AAChE,uCAA6C;AAG7C,8CAAgD;AAEhD,0CAAuC;AAOvC,MAAa,KAAK;IAOd,+CAA+C;IAC/C,gDAAgD;IAChD,oEAAoE;IAEpE,YACoB,IAAY,EACX,KAAY,EACZ,YAAgD,IAAI,GAAG,EAAiC;QAFzF,SAAI,GAAJ,IAAI,CAAQ;QACX,UAAK,GAAL,KAAK,CAAO;QACZ,cAAS,GAAT,SAAS,CAA+E;IAE7G,CAAC;IAED;;;;;;;;;OASG;IACH,SAAS,CAAoB,WAA2B;QACpD,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QAE9C,IAAI,CAAE,KAAK,EAAE;YACT,MAAM,IAAI,2BAAkB,CAAC,GAAI,IAAI,CAAC,IAAK,UAAW,WAAW,CAAC,IAAK,QAAQ;gBAC3E,yCAAyC,CAAC,CAAC;SAClD;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;;;;;;;OAQG;IACH,UAAU,CAAC,GAAG,UAAsB;QAChC,OAAO,UAAU;aACZ,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,4BAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;aAC1D,MAAM,CAAC,CAAC,QAAuB,EAAE,OAAiB,EAAE,EAAE;YACnD,OAAO,QAAQ;gBACX,uDAAuD;iBACtD,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;iBACvC,IAAI,CAAC,GAAG,EAAE;gBACP,qCAAqC;gBACrC,OAAO,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;QACX,CAAC,EAAE,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC;IACvC,CAAC;IAED;;;;;;;;;;;;;OAaG;IACH,MAAM,CAAC,GAAG,SAAoB;QAC1B,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACxB,MAAM,WAAW,GAAG,OAAO,CAAC,WAAmC,CAAC;YAEhE,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;YAE9C,IAAI,KAAK,EAAE;gBACP,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,IAAI,KAAK,WAAW,CAAC,IAAI;oBAC3D,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI;oBACxB,CAAC,CAAC,GAAI,KAAK,CAAC,WAAW,CAAC,IAAK,mBAAoB,WAAW,CAAC,IAAK,GAAG,CAAA;gBAEzE,MAAM,IAAI,2BAAkB,CAAC,GAAI,IAAI,CAAC,IAAK,8BAA+B,WAAY,+CAA+C,CAAC,CAAC;aAC1I;YAED,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,WAAmC,EAAE,OAAO,CAAC,CAAC;QAC7E,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;;OAGG;IACH,MAAM,CAAI,UAAyB;QAC/B,SAAS,UAAU,CAAI,CAAgB;YACnC,OAAO,CAAC,CAAE,CAAS,CAAC,IAAI,CAAC;QAC7B,CAAC;QAED,SAAS,SAAS,CAAI,CAAgB;YAClC,OAAO,CAAE,CAAC,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,IAAI,CAAC,CAAC;QAC/D,CAAC;QAED,IAAI,SAAS,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,UAAU,CAAC,EAAE;YACjD,OAAO,UAAU,CAAC;SACrB;QAED,IAAI,SAAS,CAAC,UAAU,CAAC,IAAI,mBAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE;YAC3D,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;SACnD;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,UAAe,CAAC,CAAC;IAC5C,CAAC;IAED;;;;;;;;OAQG;IACH,OAAO,CAAC,QAAkB,EAAE,IAAoB;QAC5C,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,yCAAgC,CACpD,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,EAC3B,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,EAC9B,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,IAAI,YAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAC1D,QAAQ,EACR,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAC3B,CAAC,CAAC;IACP,CAAC;IAED;;;;;;OAMG;IACH,OAAO;QACH,OAAO,IAAI,CAAC,mBAAmB,CAAc,SAAS,CAAC;aAClD,MAAM,CACH,CAAC,QAAuB,EAAE,OAAgC,EAAE,EAAE,CAC1D,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,EAC1C,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CACT,CAAC;IAC3B,CAAC;IAED;;;;;OAKG;IACH,QAAQ;QACJ,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE3E,OAAO,cAAe,IAAI,CAAC,IAAK,gBAAiB,SAAS,CAAC,IAAI,CAAC,IAAI,CAAE,IAAI,CAAC;IAC/E,CAAC;IAED;;OAEG;IACK,mBAAmB;QACvB,OAAO,IAAI,CAAC,mBAAmB,CAAgB,YAAY,EAAE,eAAe,CAAC;aACxE,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAE,OAAO,CAAC,aAAa,EAAE,CAAC;aAC5C,MAAM,CACH,CAAC,QAAuB,EAAE,OAAkC,EAAE,EAAE,CAC5D,QAAQ;aACH,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;aAChC,KAAK,CAAC,KAAK,CAAC,EAAE;YACX,MAAM,IAAI,6BAAoB,CAAC,GAAI,IAAI,CAAC,IAAK,uCAAwC,OAAO,CAAC,WAAW,CAAC,IAAK,EAAE,EAAE,KAAK,CAAC,CAAC;QAC7H,CAAC,CAAC,EACV,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAC1B,CAAA;IACT,CAAC;IAED;;;OAGG;IACK,mBAAmB,CAAI,GAAG,WAA2B;QACzD,MAAM,aAAa,GAAG,CAAC,GAAuC,EAAa,EAAE,CACzE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;QAE7B,MAAM,2BAA2B,GAAG,CAAC,OAAoB,EAAW,EAAE,CAClE,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,OAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC;QAEhF,OAAO,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC;aAC/B,MAAM,CAAC,2BAA2B,CAAuB,CAAC;IACnE,CAAC;IAED;;;OAGG;IACK,aAAa,CAAoB,WAA2B;QAChE,KAAK,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE;YAClD,IAAI,OAAO,YAAY,WAAW,EAAE;gBAChC,OAAO,OAAY,CAAC;aACvB;SACJ;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;IAED;;;;;;;;;OASG;IACK,QAAQ,CAAC,SAAwB;QACrC,OAAO,OAAO,SAAS,KAAK,QAAQ;YAChC,CAAC,CAAC,IAAI,YAAI,CAAC,SAAS,CAAC;YACrB,CAAC,CAAC,SAAS,CAAC;IACpB,CAAC;CACJ;AApOD,sBAoOC"}
+{"version":3,"file":"Actor.js","sourceRoot":"","sources":["../../../src/screenplay/actor/Actor.ts"],"names":[],"mappings":"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"}

package/lib/screenplay/index.d.ts

@@ -6,7 +6,7 @@ export * from './actor';
 export * from './Answerable';
 export * from './Interaction';
 export * from './interactions';
+export * from './Optional';
 export * from './Question';
 export * from './questions';
 export * from './Task';
-export * from './tasks';

package/lib/screenplay/index.js

@@ -18,8 +18,8 @@ __exportStar(require("./actor"), exports);
 __exportStar(require("./Answerable"), exports);
 __exportStar(require("./Interaction"), exports);
 __exportStar(require("./interactions"), exports);
+__exportStar(require("./Optional"), exports);
 __exportStar(require("./Question"), exports);
 __exportStar(require("./questions"), exports);
 __exportStar(require("./Task"), exports);
-__exportStar(require("./tasks"), exports);
 //# sourceMappingURL=index.js.map

package/lib/screenplay/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/screenplay/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAA4B;AAC5B,4CAA0B;AAC1B,gDAA8B;AAC9B,6CAA2B;AAC3B,0CAAwB;AACxB,+CAA6B;AAC7B,gDAA8B;AAC9B,iDAA+B;AAC/B,6CAA2B;AAC3B,8CAA4B;AAC5B,yCAAuB;AACvB,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/screenplay/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAA4B;AAC5B,4CAA0B;AAC1B,gDAA8B;AAC9B,6CAA2B;AAC3B,0CAAwB;AACxB,+CAA6B;AAC7B,gDAA8B;AAC9B,iDAA+B;AAC/B,6CAA2B;AAC3B,6CAA2B;AAC3B,8CAA4B;AAC5B,yCAAuB"}

package/lib/screenplay/interactions/index.d.ts

@@ -1,3 +1,2 @@
 export * from './Log';
-export * from './See';
 export * from './TakeNote';

package/lib/screenplay/interactions/index.js

@@ -11,6 +11,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Log"), exports);
-__exportStar(require("./See"), exports);
 __exportStar(require("./TakeNote"), exports);
 //# sourceMappingURL=index.js.map

package/lib/screenplay/interactions/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/screenplay/interactions/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAAsB;AACtB,wCAAsB;AACtB,6CAA2B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/screenplay/interactions/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAAsB;AACtB,6CAA2B"}

package/lib/screenplay/questions/Check.d.ts

@@ -44,7 +44,7 @@ export declare class Check<Actual> extends Task {
     private readonly expectation;
     private readonly activities;
     private readonly alternativeActivities;
-    static whether<A>(actual: Answerable<A>, expectation: Expectation<any, A>): {
+    static whether<A>(actual: Answerable<A>, expectation: Expectation<A>): {
         andIfSo: (...activities: Activity[]) => Check<A>;
     };
     /**
@@ -54,7 +54,7 @@ export declare class Check<Actual> extends Task {
      * @param activities
      * @param alternativeActivities
      */
-    constructor(actual: Answerable<Actual>, expectation: Expectation<any, Actual>, activities: Activity[], alternativeActivities?: Activity[]);
+    constructor(actual: Answerable<Actual>, expectation: Expectation<Actual>, activities: Activity[], alternativeActivities?: Activity[]);
     /**
      * @param {...@serenity-js/core/lib/screenplay~Activity[]} alternativeActivities
      * @return {@serenity-js/core/lib/screenplay~Task}
@@ -72,7 +72,7 @@ export declare class Check<Actual> extends Task {
      * @see {@link @serenity-js/core/lib/screenplay/actor~AnswersQuestions}
      * @see {@link @serenity-js/core/lib/screenplay/actor~PerformsActivities}
      */
-    performAs(actor: AnswersQuestions & PerformsActivities): PromiseLike<void>;
+    performAs(actor: AnswersQuestions & PerformsActivities): Promise<void>;
     /**
      * @desc
      *  Generates a description to be used when reporting this {@link @serenity-js/core/lib/screenplay~Activity}.

package/lib/screenplay/questions/Check.js

@@ -80,13 +80,11 @@ class Check extends Task_1.Task {
      * @see {@link @serenity-js/core/lib/screenplay/actor~AnswersQuestions}
      * @see {@link @serenity-js/core/lib/screenplay/actor~PerformsActivities}
      */
-    performAs(actor) {
-        return Promise.all([
-            actor.answer(this.actual),
-            actor.answer(this.expectation),
-        ]).then(([actual, expectation]) => expectation(actual).then(outcome => outcome instanceof expectations_1.ExpectationMet
+    async performAs(actor) {
+        const outcome = await actor.answer(this.expectation.isMetFor(this.actual));
+        return outcome instanceof expectations_1.ExpectationMet
             ? actor.attemptsTo(...this.activities)
-            : actor.attemptsTo(...this.alternativeActivities)));
+            : actor.attemptsTo(...this.alternativeActivities);
     }
     /**
      * @desc
@@ -95,7 +93,7 @@ class Check extends Task_1.Task {
      * @returns {string}
      */
     toString() {
-        return (0, io_1.formatted) `#actor checks whether ${this.actual} does ${this.expectation}`;
+        return (0, io_1.d) `#actor checks whether ${this.actual} does ${this.expectation}`;
     }
 }
 exports.Check = Check;

package/lib/screenplay/questions/Check.js.map

@@ -1 +1 @@
-{"version":3,"file":"Check.js","sourceRoot":"","sources":["../../../src/screenplay/questions/Check.ts"],"names":[],"mappings":";;;AAAA,iCAAqC;AAIrC,kCAA+B;AAE/B,iDAAgD;AAEhD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,MAAa,KAAc,SAAQ,WAAI;IAQnC;;;;;;OAMG;IACH,YACqB,MAA0B,EAC1B,WAAqC,EACrC,UAAsB,EACtB,wBAAoC,EAAE;QAEvD,KAAK,EAAE,CAAC;QALS,WAAM,GAAN,MAAM,CAAoB;QAC1B,gBAAW,GAAX,WAAW,CAA0B;QACrC,eAAU,GAAV,UAAU,CAAY;QACtB,0BAAqB,GAArB,qBAAqB,CAAiB;IAG3D,CAAC;IArBD,6EAA6E;IAC7E,MAAM,CAAC,OAAO,CAAI,MAAqB,EAAE,WAAgC;QACrE,OAAO;YACH,OAAO,EAAE,CAAC,GAAG,UAAsB,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,MAAM,EAAE,WAAW,EAAE,UAAU,CAAC;SACrF,CAAC;IACN,CAAC;IAkBD;;;OAGG;IACH,SAAS,CAAC,GAAG,qBAAiC;QAC1C,OAAO,IAAI,KAAK,CAAS,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAAC;IACpG,CAAC;IAED;;;;;;;;;;;OAWG;IACH,SAAS,CAAC,KAA4C;QAClD,OAAO,OAAO,CAAC,GAAG,CAAC;YACf,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;YACzB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;SACjC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,EAAE,CAC9B,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAC/B,OAAO,YAAY,6BAAc;YAC7B,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC;YACtC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,qBAAqB,CAAC,CACxD,CACJ,CAAC;IACN,CAAC;IAED;;;;;OAKG;IACH,QAAQ;QACJ,OAAO,IAAA,cAAS,EAAC,yBAA0B,IAAI,CAAC,MAAO,SAAU,IAAI,CAAC,WAAY,EAAE,CAAC;IACzF,CAAC;CACJ;AAlED,sBAkEC"}
+{"version":3,"file":"Check.js","sourceRoot":"","sources":["../../../src/screenplay/questions/Check.ts"],"names":[],"mappings":";;;AAAA,iCAA6B;AAI7B,kCAA+B;AAE/B,iDAAgD;AAEhD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,MAAa,KAAc,SAAQ,WAAI;IAQnC;;;;;;OAMG;IACH,YACqB,MAA0B,EAC1B,WAAgC,EAChC,UAAsB,EACtB,wBAAoC,EAAE;QAEvD,KAAK,EAAE,CAAC;QALS,WAAM,GAAN,MAAM,CAAoB;QAC1B,gBAAW,GAAX,WAAW,CAAqB;QAChC,eAAU,GAAV,UAAU,CAAY;QACtB,0BAAqB,GAArB,qBAAqB,CAAiB;IAG3D,CAAC;IArBD,6EAA6E;IAC7E,MAAM,CAAC,OAAO,CAAI,MAAqB,EAAE,WAA2B;QAChE,OAAO;YACH,OAAO,EAAE,CAAC,GAAG,UAAsB,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,MAAM,EAAE,WAAW,EAAE,UAAU,CAAC;SACrF,CAAC;IACN,CAAC;IAkBD;;;OAGG;IACH,SAAS,CAAC,GAAG,qBAAiC;QAC1C,OAAO,IAAI,KAAK,CAAS,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAAC;IACpG,CAAC;IAED;;;;;;;;;;;OAWG;IACH,KAAK,CAAC,SAAS,CAAC,KAA4C;QACxD,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAE3E,OAAO,OAAO,YAAY,6BAAc;YACpC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC;YACtC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAC1D,CAAC;IAED;;;;;OAKG;IACH,QAAQ;QACJ,OAAO,IAAA,MAAC,EAAA,yBAA0B,IAAI,CAAC,MAAO,SAAU,IAAI,CAAC,WAAY,EAAE,CAAC;IAChF,CAAC;CACJ;AA7DD,sBA6DC"}

package/lib/screenplay/questions/Expectation.d.ts

@@ -1,11 +1,11 @@
-import { Answerable, AnswersQuestions, Question } from '../';
+import { Answerable, AnswersQuestions, QuestionAdapter } from '../';
 import { ExpectationOutcome } from './expectations';
 /**
  * @public
  *
- * @typedef {function(actual: A, expected: E) => boolean} Predicate<A,E>
+ * @typedef {function(actual: Answerable<Actual>) => Promise<ExpectationOutcome<Expected, Actual>> | ExpectationOutcome<unknown, Actual>} Predicate<Actual>
  */
-export declare type Predicate<A, E> = (actual: A, expected: E) => boolean;
+export declare type Predicate<Actual> = (actor: AnswersQuestions, actual: Answerable<Actual>) => Promise<ExpectationOutcome<unknown, Actual>> | ExpectationOutcome<unknown, Actual>;
 /**
  * @desc
  *  Defines an expectation to be used with [assertions](/modules/assertions)
@@ -13,7 +13,9 @@ export declare type Predicate<A, E> = (actual: A, expected: E) => boolean;
  *
  * @extends {Question}
  */
-export declare abstract class Expectation<Expected, Actual = Expected> extends Question<(actual: Actual) => Promise<ExpectationOutcome<Expected, Actual>>> {
+export declare class Expectation<Actual> {
+    private subject;
+    private readonly predicate;
     /**
      * @desc
      *  Used to define a simple {@link Expectation}
@@ -34,10 +36,10 @@ export declare abstract class Expectation<Expected, Actual = Expected> extends Q
      * @param {string} relationshipName
      * @param {@serenity-js/core/lib/screenplay~Answerable<E>} expectedValue
      *
-     * @returns {"soThat": function(predicate: Predicate<A,E>): Expectation<E, A>}
+     * @returns {"soThat": function(predicate: Predicate<Expected, Actual>): Expectation<Expected, Actual>}
      */
-    static thatActualShould<E, A>(relationshipName: string, expectedValue: Answerable<E>): {
-        soThat: (predicate: Predicate<A, E>) => Expectation<E, A>;
+    static thatActualShould<E, A>(relationshipName: string, expectedValue?: Answerable<E>): {
+        soThat: (simplifiedPredicate: (actualValue: A, expectedValue: E) => Promise<boolean> | boolean) => Expectation<A>;
     };
     /**
      * @desc
@@ -64,8 +66,11 @@ export declare abstract class Expectation<Expected, Actual = Expected> extends Q
      *
      * @returns {"soThat": function(...expectations: Array<Expectation<any, A>>): Expectation<any, A>}
      */
-    static to<A>(relationshipName: string): {
-        soThatActual: (...expectations: Array<Expectation<any, A>>) => Expectation<any, A>;
+    static to<E, A>(relationshipName: string): {
+        soThatActual: (...expectations: Array<Expectation<A>>) => Expectation<A>;
     };
-    abstract answeredBy(actor: AnswersQuestions): (actual: Actual) => Promise<ExpectationOutcome<Expected, Actual>>;
+    protected constructor(subject: string, predicate: Predicate<Actual>);
+    isMetFor(actual: Answerable<Actual>): QuestionAdapter<ExpectationOutcome<unknown, Actual>>;
+    describedAs(subject: string): this;
+    toString(): string;
 }

package/lib/screenplay/questions/Expectation.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Expectation = void 0;
 const io_1 = require("../../io");
 const __1 = require("../");
-const expectations_1 = require("./expectations");
 /**
  * @desc
  *  Defines an expectation to be used with [assertions](/modules/assertions)
@@ -11,7 +10,11 @@ const expectations_1 = require("./expectations");
  *
  * @extends {Question}
  */
-class Expectation extends __1.Question {
+class Expectation {
+    constructor(subject, predicate) {
+        this.subject = subject;
+        this.predicate = predicate;
+    }
     /**
      * @desc
      *  Used to define a simple {@link Expectation}
@@ -32,12 +35,20 @@ class Expectation extends __1.Question {
      * @param {string} relationshipName
      * @param {@serenity-js/core/lib/screenplay~Answerable<E>} expectedValue
      *
-     * @returns {"soThat": function(predicate: Predicate<A,E>): Expectation<E, A>}
+     * @returns {"soThat": function(predicate: Predicate<Expected, Actual>): Expectation<Expected, Actual>}
      */
     static thatActualShould(relationshipName, expectedValue) {
         return ({
-            soThat: (predicate) => {
-                return new DynamicallyGeneratedExpectation(relationshipName, predicate, expectedValue);
+            soThat: (simplifiedPredicate) => {
+                const subject = relationshipName + ' ' + (0, io_1.d) `${expectedValue}`;
+                return new Expectation(subject, async (actor, actualValue) => {
+                    const expected = await actor.answer(expectedValue);
+                    const actual = await actor.answer(actualValue);
+                    const result = await simplifiedPredicate(actual, expected);
+                    return result
+                        ? new __1.ExpectationMet(subject, expected, actual)
+                        : new __1.ExpectationNotMet(subject, expected, actual);
+                });
             },
         });
     }
@@ -69,43 +80,23 @@ class Expectation extends __1.Question {
     static to(relationshipName) {
         return {
             soThatActual: (expectation) => {
-                return new ExpectationAlias(relationshipName, expectation);
+                return new Expectation(relationshipName, async (actor, actualValue) => {
+                    const outcome = await actor.answer(expectation.isMetFor(actualValue));
+                    return outcome;
+                });
             },
         };
     }
-}
-exports.Expectation = Expectation;
-/**
- * @package
- */
-class DynamicallyGeneratedExpectation extends Expectation {
-    constructor(description, predicate, expectedValue) {
-        super(`${description} ${(0, io_1.formatted) `${expectedValue}`}`);
-        this.description = description;
-        this.predicate = predicate;
-        this.expectedValue = expectedValue;
+    isMetFor(actual) {
+        return __1.Question.about(this.subject, actor => this.predicate(actor, actual));
     }
-    answeredBy(actor) {
-        return (actual) => actor.answer(this.expectedValue)
-            .then(expected => {
-            return this.predicate(actual, expected)
-                ? new expectations_1.ExpectationMet(this.toString(), expected, actual)
-                : new expectations_1.ExpectationNotMet(this.toString(), expected, actual);
-        });
-    }
-}
-/**
- * @package
- */
-class ExpectationAlias extends Expectation {
-    constructor(subject, expectation) {
-        super(subject);
-        this.expectation = expectation;
+    describedAs(subject) {
+        this.subject = subject;
+        return this;
     }
-    answeredBy(actor) {
-        return (actual) => this.expectation.answeredBy(actor)(actual).then(_ => _ instanceof expectations_1.ExpectationMet
-            ? new expectations_1.ExpectationMet(this.subject, _.expected, _.actual)
-            : new expectations_1.ExpectationNotMet(_.message, _.expected, _.actual));
+    toString() {
+        return this.subject;
     }
 }
+exports.Expectation = Expectation;
 //# sourceMappingURL=Expectation.js.map

package/lib/screenplay/questions/Expectation.js.map

@@ -1 +1 @@
-{"version":3,"file":"Expectation.js","sourceRoot":"","sources":["../../../src/screenplay/questions/Expectation.ts"],"names":[],"mappings":";;;AAAA,iCAAqC;AACrC,2BAA6D;AAC7D,iDAAwF;AASxF;;;;;;GAMG;AACH,MAAsB,WAClB,SAAQ,YAA2E;IAGnF;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,MAAM,CAAC,gBAAgB,CAAO,gBAAwB,EAAE,aAA4B;QAGhF,OAAO,CAAC;YACJ,MAAM,EAAE,CAAC,SAA0B,EAAqB,EAAE;gBACtD,OAAO,IAAI,+BAA+B,CAAO,gBAAgB,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;YACjG,CAAC;SACJ,CAAC,CAAC;IACP,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,MAAM,CAAC,EAAE,CAAI,gBAAwB;QAGjC,OAAO;YACH,YAAY,EAAE,CAAC,WAAgC,EAAuB,EAAE;gBACpE,OAAO,IAAI,gBAAgB,CAAI,gBAAgB,EAAE,WAAW,CAAC,CAAC;YAClE,CAAC;SACJ,CAAC;IACN,CAAC;CAGJ;AAxED,kCAwEC;AAED;;GAEG;AACH,MAAM,+BAAkD,SAAQ,WAA6B;IAEzF,YACqB,WAAmB,EACnB,SAAsC,EACtC,aAAmC;QAEpD,KAAK,CAAC,GAAI,WAAY,IAAK,IAAA,cAAS,EAAC,GAAI,aAAc,EAAG,EAAE,CAAC,CAAC;QAJ7C,gBAAW,GAAX,WAAW,CAAQ;QACnB,cAAS,GAAT,SAAS,CAA6B;QACtC,kBAAa,GAAb,aAAa,CAAsB;IAGxD,CAAC;IAED,UAAU,CAAC,KAAuB;QAE9B,OAAO,CAAC,MAAc,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC;aACtD,IAAI,CAAC,QAAQ,CAAC,EAAE;YACb,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC;gBACnC,CAAC,CAAC,IAAI,6BAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC;gBACvD,CAAC,CAAC,IAAI,gCAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;IACX,CAAC;CACJ;AAED;;GAEG;AACH,MAAM,gBAAyB,SAAQ,WAAwB;IAE3D,YACI,OAAe,EACE,WAAqC;QAEtD,KAAK,CAAC,OAAO,CAAC,CAAC;QAFE,gBAAW,GAAX,WAAW,CAA0B;IAG1D,CAAC;IAED,UAAU,CAAC,KAAuB;QAE9B,OAAO,CAAC,MAAc,EAAE,EAAE,CACtB,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,YAAY,6BAAc;YAC5E,CAAC,CAAC,IAAI,6BAAc,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC;YACxD,CAAC,CAAC,IAAI,gCAAiB,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IACtE,CAAC;CACJ"}
+{"version":3,"file":"Expectation.js","sourceRoot":"","sources":["../../../src/screenplay/questions/Expectation.ts"],"names":[],"mappings":";;;AAAA,iCAA6B;AAC7B,2BAAiH;AAWjH;;;;;;GAMG;AACH,MAAa,WAAW;IA0FpB,YACY,OAAe,EACN,SAA4B;QADrC,YAAO,GAAP,OAAO,CAAQ;QACN,cAAS,GAAT,SAAS,CAAmB;IAEjD,CAAC;IA5FD;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,MAAM,CAAC,gBAAgB,CAAO,gBAAwB,EAAE,aAA6B;QAGjF,OAAO,CAAC;YACJ,MAAM,EAAE,CAAC,mBAAqF,EAAkB,EAAE;gBAC9G,MAAM,OAAO,GAAG,gBAAgB,GAAG,GAAG,GAAG,IAAA,MAAC,EAAA,GAAG,aAAa,EAAE,CAAC;gBAE7D,OAAO,IAAI,WAAW,CAClB,OAAO,EACP,KAAK,EAAE,KAAuB,EAAE,WAA0B,EAAqC,EAAE;oBAC7F,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;oBACnD,MAAM,MAAM,GAAK,MAAM,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;oBAEjD,MAAM,MAAM,GAAK,MAAM,mBAAmB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;oBAE7D,OAAO,MAAM;wBACT,CAAC,CAAC,IAAI,kBAAc,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC;wBAC/C,CAAC,CAAC,IAAI,qBAAiB,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;gBAC3D,CAAC,CACJ,CAAC;YACN,CAAC;SACJ,CAAC,CAAC;IACP,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,MAAM,CAAC,EAAE,CAAO,gBAAwB;QAGpC,OAAO;YACH,YAAY,EAAE,CAAC,WAA2B,EAAkB,EAAE;gBAC1D,OAAO,IAAI,WAAW,CAClB,gBAAgB,EAChB,KAAK,EAAE,KAAuB,EAAE,WAA0B,EAAqC,EAAE;oBAC7F,MAAM,OAAO,GAAI,MAAM,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;oBAEvE,OAAO,OAAmC,CAAC;gBAC/C,CAAC,CACJ,CAAC;YACN,CAAC;SACJ,CAAC;IACN,CAAC;IAQD,QAAQ,CAAC,MAA0B;QAC/B,OAAO,YAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;IAChF,CAAC;IAED,WAAW,CAAC,OAAe;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,QAAQ;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;CACJ;AA5GD,kCA4GC"}