@serenity-js/core 2.32.3 → 3.0.0-rc.1

package/lib/screenplay/Question.d.ts

@@ -1,6 +1,5 @@
-import { Mappable } from '../io/collections';
 import { AnswersQuestions, UsesAbilities } from './actor';
-import { AnswerMappingFunction } from './questions/mappings';
+import { Adapter } from './model';
 /**
  * @desc
  *  Enables the {@link Actor} to query the system under test.
@@ -51,14 +50,6 @@ import { AnswerMappingFunction } from './questions/mappings';
  * @abstract
  */
 export declare abstract class Question<T> {
-    protected subject: string;
-    /**
-     * @param {string} subject
-     *  The subject of this question
-     *
-     * @protected
-     */
-    protected constructor(subject: string);
     /**
      * @desc
      *  Factory method that simplifies the process of defining custom questions.
@@ -74,7 +65,7 @@ export declare abstract class Question<T> {
      *
      * @returns {Question<R>}
      */
-    static about<R>(description: string, body: (actor: AnswersQuestions & UsesAbilities) => R): Question<R>;
+    static about<R>(description: string, body: (actor: AnswersQuestions & UsesAbilities) => R): Question<R> & Adapter<Awaited<R>>;
     /**
      * @desc
      *  Checks if the value is a {@link Question}.
@@ -93,7 +84,7 @@ export declare abstract class Question<T> {
      *
      * @returns {string}
      */
-    toString(): string;
+    abstract toString(): string;
     /**
      * @desc
      *  Changes the description of this question's subject.
@@ -101,79 +92,11 @@ export declare abstract class Question<T> {
      * @param {string} subject
      * @returns {Question<T>}
      */
-    describedAs(subject: string): 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<O>(mapping: AnswerMappingFunction<AnswerOrItemOfMappableCollection<T>, O>): Question<Promise<Mapped<T, O>>>;
+    abstract describedAs(subject: string): this;
     /**
      * @abstract
+     * // todo check why api docs are not getting generated for this methods
      */
     abstract answeredBy(actor: AnswersQuestions & UsesAbilities): T;
+    as<O>(mapping: (answer: Awaited<T>) => Promise<O> | O): Question<Promise<O>>;
 }
-/**
- * @package
- */
-declare type AnswerOrItemOfMappableCollection<V> = V extends PromiseLike<infer PromisedValue> ? PromisedValue extends Mappable<infer Item> ? Item : PromisedValue : V extends Mappable<infer Item> ? Item : V;
-/**
- * @package
- */
-declare type Mapped<T, O> = T extends PromiseLike<infer PromisedValue> ? PromisedValue extends Mappable<infer Item> ? O[] : O : T extends Mappable<infer Item> ? O[] : O;
-export {};

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 inspected_1 = require("../io/inspected");
+const model_1 = require("./model");
 /**
  * @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 (0, model_1.createAdapter)(new AnonymousQuestion(description, body));
     }
     /**
      * @desc
@@ -93,90 +85,11 @@ class Question {
     static isAQuestion(maybeQuestion) {
         return !!maybeQuestion && !!maybeQuestion.answeredBy;
     }
-    /**
-     * @desc
-     *  Describes the subject of this {@link Question}.
-     *
-     * @returns {string}
-     */
-    toString() {
-        return this.subject;
-    }
-    /**
-     * @desc
-     *  Changes the description of this question's subject.
-     *
-     * @param {string} subject
-     * @returns {Question<T>}
-     */
-    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))));
+    as(mapping) {
+        return Question.about(`${this.toString()} as ${(0, inspected_1.inspected)(mapping, { inline: true })}`, async (actor) => {
+            const answer = (await actor.answer(this));
+            return mapping(answer);
+        });
     }
 }
 exports.Question = Question;
@@ -184,9 +97,9 @@ exports.Question = Question;
  * @package
  */
 class AnonymousQuestion extends Question {
-    constructor(description, body) {
-        super(description);
-        this.description = description;
+    constructor(subject, body) {
+        super();
+        this.subject = subject;
         this.body = body;
     }
     answeredBy(actor) {
@@ -203,5 +116,8 @@ class AnonymousQuestion extends Question {
         this.subject = subject;
         return this;
     }
+    toString() {
+        return this.subject;
+    }
 }
 //# 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":";;;AAAA,+CAA4C;AAE5C,mCAAiD;AAEjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AACH,MAAsB,QAAQ;IAE1B;;;;;;;;;;;;;;OAcG;IACH,MAAM,CAAC,KAAK,CAAI,WAAmB,EAAE,IAAoD;QACrF,OAAO,IAAA,qBAAa,EAAI,IAAI,iBAAiB,CAAI,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC;IACzE,CAAC;IAED;;;;;;;;;;OAUG;IACH,MAAM,CAAC,WAAW,CAAI,aAAsB;QACxC,OAAO,CAAC,CAAE,aAAa,IAAI,CAAC,CAAG,aAAqB,CAAC,UAAU,CAAC;IACpE,CAAC;IAyBM,EAAE,CAAI,OAA+C;QACxD,OAAO,QAAQ,CAAC,KAAK,CAAa,GAAI,IAAI,CAAC,QAAQ,EAAG,OAAQ,IAAA,qBAAS,EAAC,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAE,EAAE,EAAE,KAAK,EAAC,KAAK,EAAC,EAAE;YACjH,MAAM,MAAM,GAAG,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAe,CAAC;YACxD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAjED,4BAiEC;AAED;;GAEG;AACH,MAAM,iBAAqB,SAAQ,QAAW;IAC1C,YAAoB,OAAe,EAAU,IAAoD;QAC7F,KAAK,EAAE,CAAC;QADQ,YAAO,GAAP,OAAO,CAAQ;QAAU,SAAI,GAAJ,IAAI,CAAgD;IAEjG,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;IAED,QAAQ;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;CACJ"}

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":"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"}
+{"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 './model';
 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("./model"), 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,0CAAwB;AACxB,6CAA2B;AAC3B,8CAA4B;AAC5B,yCAAuB"}

package/lib/screenplay/model/Adapter.d.ts

@@ -0,0 +1,8 @@
+import { Answerable } from '../Answerable';
+import { Interaction } from '../Interaction';
+import { Question } from '../Question';
+export declare type Adapter<OriginalType> = {
+    [Field in keyof Omit<OriginalType, keyof Question<OriginalType>>]: OriginalType[Field] extends (...args: infer OriginalParameters) => infer OriginalMethodResult ? (...args: {
+        [P in keyof OriginalParameters]: Answerable<OriginalParameters[P]>;
+    }) => Question<Promise<Awaited<OriginalMethodResult>>> & Interaction & Adapter<Awaited<OriginalMethodResult>> : Question<Promise<Awaited<OriginalType[Field]>>> & Interaction & Adapter<Awaited<OriginalType[Field]>>;
+};

package/lib/screenplay/{questions/proxies/PropertyPathKey.js → model/Adapter.js}

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=PropertyPathKey.js.map
+//# sourceMappingURL=Adapter.js.map

package/lib/screenplay/model/Adapter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Adapter.js","sourceRoot":"","sources":["../../../src/screenplay/model/Adapter.ts"],"names":[],"mappings":""}

package/lib/screenplay/model/createAdapter.d.ts

@@ -0,0 +1,3 @@
+import { Question } from '../Question';
+import { Adapter } from './Adapter';
+export declare function createAdapter<A, Q extends Question<A> = Question<A>>(question: Q): Q & Adapter<Awaited<A>>;

package/lib/screenplay/model/createAdapter.js

@@ -0,0 +1,112 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createAdapter = void 0;
+const errors_1 = require("../../errors");
+const inspected_1 = require("../../io/inspected");
+const Interaction_1 = require("../Interaction");
+const Question_1 = require("../Question");
+function createAdapter(question) {
+    return new Proxy(question, {
+        get(target, key, receiver) {
+            if (key === Symbol.toPrimitive) {
+                return (_hint) => {
+                    return target.toString();
+                };
+            }
+            if (key in target) {
+                return Reflect.get(target, key, receiver);
+            }
+            if (doNotProxy(key)) {
+                return;
+            }
+            const fieldDescription = (typeof key === 'number' || /^\d+$/.test(String(key)))
+                ? `[${String(key)}]` // array index
+                : `.${String(key)}`; // field/method name
+            // when property is invoked as a method
+            function proxy(...originalParameters) {
+                const parameterDescriptions = [
+                    '(',
+                    originalParameters.map(p => (0, inspected_1.inspected)(p, { inline: true, markQuestions: true })).join(', '),
+                    ')'
+                ].join('');
+                const originalSubject = (0, inspected_1.inspected)(question, { inline: true, markQuestions: true });
+                return createAdapter(new DynamicProp(originalSubject + fieldDescription + parameterDescriptions, async (actor) => {
+                    // resolve the original answer
+                    const answer = await actor.answer(target);
+                    if (answer === undefined) {
+                        throw new errors_1.LogicError(`${(0, inspected_1.inspected)(target, { inline: true, markQuestions: true })} is undefined, can't read property '${String(key)}'`);
+                    }
+                    if (typeof answer[key] !== 'function') {
+                        throw new errors_1.LogicError(`${(0, inspected_1.inspected)(target, { inline: true, markQuestions: true })} does not have a method called '${String(key)}'`);
+                    }
+                    // convert parameters from Answerable<T> => T
+                    const parameters = await (Promise.all(originalParameters.map(parameter => {
+                        return actor.answer(parameter);
+                    })));
+                    // invoke the method call on the original answer
+                    return answer[key](...parameters);
+                }));
+            }
+            const originalSubject = (0, inspected_1.inspected)(question, { inline: true, markQuestions: true });
+            proxy.subject = originalSubject + fieldDescription;
+            // when property is accessed as a field
+            const body = async (actor) => {
+                const answer = await actor.answer(target);
+                if (answer === undefined) {
+                    throw new errors_1.LogicError(`${target} is undefined, can't read property "${String(key)}"`);
+                }
+                return answer[key];
+            };
+            proxy.answeredBy = body;
+            proxy.performAs = body;
+            proxy.toString = () => {
+                return proxy.subject;
+            };
+            proxy.describedAs = (newSubject) => {
+                proxy.subject = newSubject;
+                return proxy;
+            };
+            proxy.as = (mapping) => {
+                return Question_1.Question.about(`${proxy.subject} as ${(0, inspected_1.inspected)(mapping, { inline: true })}`, async (actor) => {
+                    const answer = await actor.answer(proxy);
+                    return mapping(answer);
+                });
+            };
+            return createAdapter(proxy);
+        }
+    });
+}
+exports.createAdapter = createAdapter;
+function doNotProxy(key) {
+    const prohibited = [
+        'then', // don't proxy Promises
+    ];
+    return prohibited.includes(key);
+}
+class DynamicProp extends Interaction_1.Interaction {
+    constructor(subject, body) {
+        super();
+        this.subject = subject;
+        this.body = body;
+    }
+    answeredBy(actor) {
+        return this.body(actor);
+    }
+    async performAs(actor) {
+        await this.body(actor);
+    }
+    as(mapping) {
+        return createAdapter(new DynamicProp(`${this.subject} as ${(0, inspected_1.inspected)(mapping, { inline: true })}`, async (actor) => {
+            const answer = (await actor.answer(this));
+            return mapping(answer);
+        }));
+    }
+    describedAs(subject) {
+        this.subject = subject;
+        return this;
+    }
+    toString() {
+        return this.subject;
+    }
+}
+//# sourceMappingURL=createAdapter.js.map

package/lib/screenplay/model/createAdapter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createAdapter.js","sourceRoot":"","sources":["../../../src/screenplay/model/createAdapter.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,2 @@
+export * from './Adapter';
+export * from './createAdapter';

package/lib/screenplay/{tasks → model}/index.js

@@ -10,5 +10,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./Loop"), exports);
+__exportStar(require("./Adapter"), exports);
+__exportStar(require("./createAdapter"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/screenplay/model/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAA0B;AAC1B,kDAAgC"}

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

@@ -14,6 +14,8 @@ 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>>> {
+    protected subject: string;
+    constructor(subject: string);
     /**
      * @desc
      *  Used to define a simple {@link Expectation}
@@ -68,4 +70,13 @@ export declare abstract class Expectation<Expected, Actual = Expected> extends Q
         soThatActual: (...expectations: Array<Expectation<any, A>>) => Expectation<any, A>;
     };
     abstract answeredBy(actor: AnswersQuestions): (actual: Actual) => Promise<ExpectationOutcome<Expected, Actual>>;
+    /**
+     * @desc
+     *  Changes the description of this question's subject.
+     *
+     * @param {string} subject
+     * @returns {Question<T>}
+     */
+    describedAs(subject: string): this;
+    toString(): string;
 }

package/lib/screenplay/questions/Expectation.js

@@ -12,6 +12,10 @@ const expectations_1 = require("./expectations");
  * @extends {Question}
  */
 class Expectation extends __1.Question {
+    constructor(subject) {
+        super();
+        this.subject = subject;
+    }
     /**
      * @desc
      *  Used to define a simple {@link Expectation}
@@ -73,6 +77,20 @@ class Expectation extends __1.Question {
             },
         };
     }
+    /**
+     * @desc
+     *  Changes the description of this question's subject.
+     *
+     * @param {string} subject
+     * @returns {Question<T>}
+     */
+    describedAs(subject) {
+        this.subject = subject;
+        return this;
+    }
+    toString() {
+        return this.subject;
+    }
 }
 exports.Expectation = Expectation;
 /**
@@ -81,7 +99,6 @@ exports.Expectation = Expectation;
 class DynamicallyGeneratedExpectation extends Expectation {
     constructor(description, predicate, expectedValue) {
         super(`${description} ${(0, io_1.formatted) `${expectedValue}`}`);
-        this.description = description;
         this.predicate = predicate;
         this.expectedValue = expectedValue;
     }

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,iCAAqC;AACrC,2BAA6D;AAC7D,iDAAwF;AASxF;;;;;;GAMG;AACH,MAAsB,WAClB,SAAQ,YAA2E;IAEnF,YAAsB,OAAe;QACjC,KAAK,EAAE,CAAC;QADU,YAAO,GAAP,OAAO,CAAQ;IAErC,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;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;IAID;;;;;;OAMG;IACH,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;AA3FD,kCA2FC;AAED;;GAEG;AACH,MAAM,+BAAkD,SAAQ,WAA6B;IAEzF,YACI,WAAmB,EACF,SAAsC,EACtC,aAAmC;QAEpD,KAAK,CAAC,GAAI,WAAY,IAAK,IAAA,cAAS,EAAC,GAAI,aAAc,EAAG,EAAE,CAAC,CAAC;QAH7C,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"}

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

@@ -55,6 +55,7 @@ import { MetaQuestion } from './MetaQuestion';
  */
 export declare class List<List_Adapter_Type extends ListAdapter<Item_Type, Collection_Type, Item_Return_Type, Collection_Return_Type>, Item_Type, Collection_Type, Item_Return_Type = Item_Type, Collection_Return_Type = Collection_Type> extends Question<Collection_Return_Type> {
     private readonly collection;
+    private subject;
     /**
      * @desc
      *  Instantiates a new {@link List} configured to support standard {@link Array}.
@@ -192,5 +193,14 @@ export declare class List<List_Adapter_Type extends ListAdapter<Item_Type, Colle
      * @see {@link UsesAbilities}
      */
     answeredBy(actor: AnswersQuestions & UsesAbilities): Collection_Return_Type;
+    /**
+     * @desc
+     *  Changes the description of this question's subject.
+     *
+     * @param {string} subject
+     * @returns {Question<T>}
+     */
+    describedAs(subject: string): this;
+    toString(): string;
     private static ordinalSuffixOf;
 }

package/lib/screenplay/questions/List.js

@@ -58,8 +58,9 @@ class List extends Question_1.Question {
      * @param {List_Adapter_Type} collection
      */
     constructor(collection) {
-        super((0, io_1.formatted) `${collection}`);
+        super();
         this.collection = collection;
+        this.subject = (0, io_1.formatted) `${collection}`;
     }
     /**
      * @desc
@@ -208,6 +209,20 @@ class List extends Question_1.Question {
     answeredBy(actor) {
         return this.collection.items(actor);
     }
+    /**
+     * @desc
+     *  Changes the description of this question's subject.
+     *
+     * @param {string} subject
+     * @returns {Question<T>}
+     */
+    describedAs(subject) {
+        this.subject = subject;
+        return this;
+    }
+    toString() {
+        return this.subject;
+    }
     static ordinalSuffixOf(index) {
         const lastDigit = index % 10, lastTwoDigits = index % 100;
         switch (true) {