@serenity-js/core 2.32.4 → 3.0.0-rc.3

package/lib/screenplay/questions/Note.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Note = void 0;
+const io_1 = require("../../io");
 const abilities_1 = require("../abilities");
 const Question_1 = require("../Question");
 /**
@@ -46,8 +47,9 @@ class Note extends Question_1.Question {
      * @param {Question<Promise<Answer>> | Question<Answer> | string} topic
      */
     constructor(topic) {
-        super(`a note of ${topic}`);
+        super();
         this.topic = topic;
+        this.subject = (0, io_1.formatted) `a note of ${topic}`;
     }
     /**
      * @desc
@@ -75,6 +77,20 @@ class Note extends Question_1.Question {
     answeredBy(actor) {
         return abilities_1.TakeNotes.as(actor).answerTo(this.topic);
     }
+    /**
+     * @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.Note = Note;
 //# sourceMappingURL=Note.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"Note.js","sourceRoot":"","sources":["../../../src/screenplay/questions/Note.ts"],"names":[],"mappings":";;;AAAA,4CAAyC;AAEzC,0CAAuC;AAEvC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,MAAa,IAAa,SAAQ,mBAAyB;IAcvD;;OAEG;IACH,YAA6B,KAA4D;QACrF,KAAK,CAAC,aAAc,KAAM,EAAE,CAAC,CAAC;QADL,UAAK,GAAL,KAAK,CAAuD;IAEzF,CAAC;IAjBD;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,CAAI,KAAkD;QAC3D,OAAO,IAAI,IAAI,CAAI,KAAK,CAAC,CAAC;IAC9B,CAAC;IASD;;;;;;;;;;;OAWG;IACH,UAAU,CAAC,KAAuC;QAC9C,OAAO,qBAAS,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpD,CAAC;CACJ;AApCD,oBAoCC"}
+{"version":3,"file":"Note.js","sourceRoot":"","sources":["../../../src/screenplay/questions/Note.ts"],"names":[],"mappings":";;;AAAA,iCAAqC;AACrC,4CAAyC;AAEzC,0CAAuC;AAEvC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,MAAa,IAAa,SAAQ,mBAAyB;IAgBvD;;OAEG;IACH,YAA6B,KAA4D;QACrF,KAAK,EAAE,CAAC;QADiB,UAAK,GAAL,KAAK,CAAuD;QAErF,IAAI,CAAC,OAAO,GAAG,IAAA,cAAS,EAAC,aAAc,KAAM,EAAE,CAAC;IACpD,CAAC;IAlBD;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,CAAI,KAAkD;QAC3D,OAAO,IAAI,IAAI,CAAI,KAAK,CAAC,CAAC;IAC9B,CAAC;IAUD;;;;;;;;;;;OAWG;IACH,UAAU,CAAC,KAAuC;QAC9C,OAAO,qBAAS,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpD,CAAC;IAED;;;;;;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;AAvDD,oBAuDC"}

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

@@ -2,9 +2,6 @@ export * from './Check';
 export * from './Expectation';
 export * from './expectations';
 export * from './List';
-export * from './mappings';
 export * from './MetaQuestion';
 export * from './Note';
-export { Property } from './Property';
 export * from './q';
-export * from './Transform';

package/lib/screenplay/questions/index.js

@@ -10,16 +10,11 @@ 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 });
-exports.Property = void 0;
 __exportStar(require("./Check"), exports);
 __exportStar(require("./Expectation"), exports);
 __exportStar(require("./expectations"), exports);
 __exportStar(require("./List"), exports);
-__exportStar(require("./mappings"), exports);
 __exportStar(require("./MetaQuestion"), exports);
 __exportStar(require("./Note"), exports);
-var Property_1 = require("./Property");
-Object.defineProperty(exports, "Property", { enumerable: true, get: function () { return Property_1.Property; } });
 __exportStar(require("./q"), exports);
-__exportStar(require("./Transform"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/screenplay/questions/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,0CAAwB;AACxB,gDAA8B;AAC9B,iDAA+B;AAC/B,yCAAuB;AACvB,6CAA2B;AAC3B,iDAA+B;AAC/B,yCAAuB;AACvB,uCAAsC;AAA7B,oGAAA,QAAQ,OAAA;AACjB,sCAAoB;AACpB,8CAA4B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/screenplay/questions/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAwB;AACxB,gDAA8B;AAC9B,iDAA+B;AAC/B,yCAAuB;AACvB,iDAA+B;AAC/B,yCAAuB;AACvB,sCAAoB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serenity-js/core",
-  "version": "2.32.4",
+  "version": "3.0.0-rc.3",
   "description": "Serenity/JS Screenplay, reporting engine and core interfaces.",
   "author": {
     "name": "Jan Molak",
@@ -27,7 +27,7 @@
   ],
   "scripts": {
     "clean": "rimraf .nyc_output lib target",
-    "lint": "eslint --ext ts --config ../../.eslintrc.js .",
+    "lint": "eslint --ext ts --config ../../.eslintrc.yml .",
     "lint:fix": "npm run lint -- --fix",
     "test": "nyc --report-dir ../../target/coverage/core mocha --config ../../.mocharc.yml 'spec/**/*.spec.*'",
     "compile": "tsc --project tsconfig.json",
@@ -42,12 +42,12 @@
     "graceful-fs": "^4.2.8",
     "moment": "^2.29.1",
     "semver": "^7.3.5",
-    "tiny-types": "^1.16.1",
+    "tiny-types": "^1.17.0",
     "upath": "^2.0.1"
   },
   "devDependencies": {
-    "@documentation/esdoc-template": "2.0.0",
-    "@types/chai": "^4.2.22",
+    "@documentation/esdoc-template": "3.0.0",
+    "@types/chai": "^4.3.0",
     "@types/cuid": "^1.3.1",
     "@types/diff": "^5.0.1",
     "@types/filenamify": "^2.0.2",
@@ -67,7 +67,7 @@
     "url": "https://github.com/serenity-js/serenity-js/issues"
   },
   "engines": {
-    "node": "^12 || ^14 || ^16",
+    "node": "^14 || ^16",
     "npm": "^6 || ^7 || ^8"
   },
   "nyc": {
@@ -92,5 +92,5 @@
     "cache": true,
     "all": true
   },
-  "gitHead": "0c706f753343f1ce35b7e77460062d5762f6d4aa"
+  "gitHead": "69da7444e581c457e29e87edcd910ec06a069338"
 }

package/src/index.ts

@@ -1,6 +1,7 @@
 export * from './errors';
 export * from './instance';
-export { Duration } from './model';
+export { format } from './io';
+export { Duration, Timestamp } from './model';
 export * from './screenplay';
 export * from './Serenity';
 export { SerenityConfig } from './SerenityConfig';

package/src/io/ErrorSerialiser.ts

@@ -39,10 +39,14 @@ export class ErrorSerialiser {
     ];
 
     static serialise(error: Error): string {
+        const name = error && error.constructor && error.constructor.name
+            ? error.constructor.name
+            : error.name;
+
         const serialisedError = Object.getOwnPropertyNames(error).reduce((serialised, key) => {
             serialised[key] = error[key]
             return serialised;
-        }, { name: error.constructor.name || error.name }) as SerialisedError;
+        }, { name }) as SerialisedError;
 
         return stringify(serialisedError);
     }

package/src/io/asyncMap.ts

@@ -0,0 +1,18 @@
+/**
+ * @desc
+ *  Maps an Array<Item_Type> to an Array<Result_Type>, one element at a time.
+ *
+ * @param {Array<Item_Type>} items
+ * @param {function(item: Item_Type): Promise<Result_Type>} mappingFunction
+ */
+export function asyncMap<Item_Type, Result_Type>(items: Item_Type[], mappingFunction: (item: Item_Type) => Promise<Result_Type> | Result_Type): Promise<Result_Type[]> {
+    return items.reduce(
+        (previous, item) =>
+            previous.then(async (acc) => {
+                const result = await mappingFunction(item);
+
+                return acc.concat(result);
+            })
+        , Promise.resolve([])
+    );
+}

package/src/io/format.ts

@@ -0,0 +1,46 @@
+import { Answerable } from '../screenplay';
+import { inspected } from './inspected';
+
+/**
+ * @desc
+ *  A factory function returning a tag function that produces a human-readable description of a template containing one or more {@link Answerable}s.
+ *
+ * @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Template_literals#Tagged_template_literals
+ *
+ * @example
+ *  import { format, Question } from '@serenity-js/core';
+ *
+ *  const someQuestion = () =>
+ *      Question.about('some question', actor => 'some value');
+ *
+ *  format({ markQuestions: true }) `actor answers ${ question() }`;
+ *  // returns: actor answers <<some question>>
+ *
+ *  format({ markQuestions: false }) `actor answers ${ question() }`;
+ *  // returns: actor answers <<some question>>
+ *
+ * @example <caption>Aliasing</caption>
+ *  import { format, Question } from '@serenity-js/core';
+ *
+ *  const f = format({ markQuestions: true });
+ *
+ *  const someQuestion = () =>
+ *      Question.about('some question', actor => 'some value');
+ *
+ *  f `actor answers ${ question() }`;
+ *  // produces: actor answers <<some question>>
+ *
+ * @param {object} config
+ *  - `markQuestions`: boolean - if set to true, descriptions of questions passed in as arguments will be surrounded with double angled brackets, i.e. `<<description>>`
+ * @returns {function(templates: TemplateStringsArray, placeholders: ...Array<Answerable<any>>): string}
+ */
+export function format(config: { markQuestions: boolean }): (templates: TemplateStringsArray, ...placeholders: Array<Answerable<any>>) => string {
+    return (templates: TemplateStringsArray, ...placeholders: Array<Answerable<any>>): string => {
+        return templates
+            .map((template, i) => i < placeholders.length
+                ? [ template, inspected(placeholders[i], { inline: true, markQuestions: config.markQuestions }) ]
+                : [ template ])
+            .reduce((acc, tuple) => acc.concat(tuple))
+            .join('');
+    }
+}

package/src/io/formatted.ts

@@ -1,28 +1,20 @@
-import { Answerable } from '../screenplay/Answerable';
-import { inspected } from './inspected';
+import { Answerable } from '../screenplay';
+import { format } from './format';
 
 /**
  * @desc
  *  A tag function returning a human-readable description of a template containing one or more {@link Answerable}s.
+ *  This function is deprecated, please use {@link format} instead.
  *
  * @link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Template_literals#Tagged_template_literals
  *
+ *
+ * @deprecated
+ *
  * @param {TemplateStringsArray} templates
  * @param {Array<Answerable<any>>} placeholders
  * @returns {string}
  */
 export function formatted(templates: TemplateStringsArray, ...placeholders: Array<Answerable<any>>): string {
-    return templates
-        .map((template, i) => i < placeholders.length
-            ? [ template, compacted(inspected(placeholders[i])) ]
-            : [ template ])
-        .reduce((acc, tuple) => acc.concat(tuple))
-        .join('');
-}
-
-/** @private */
-function compacted(multiline: string) {
-    return multiline
-        .replace(/\r?\n/g, ' ')
-        .replace(/\s+/g, ' ');
+    return format({ markQuestions: false })(templates, ...placeholders);
 }

package/src/io/index.ts

@@ -1,5 +1,5 @@
 export * from './AssertionReportDiffer';
-export * from './collections';
+export * from './asyncMap';
 export * from './commaSeparated';
 export * from './Config';
 export * from './ErrorSerialiser';
@@ -7,6 +7,7 @@ export * from './ErrorStackParser';
 export * from './FileFinder';
 export * from './FileSystem';
 export * from './FileSystemLocation';
+export * from './format';
 export * from './formatted';
 export * from './json';
 export * from './ModuleLoader';

package/src/io/inspected.ts

@@ -3,6 +3,11 @@ import { inspect } from 'util';
 import { Answerable } from '../screenplay/Answerable';
 import { Question } from '../screenplay/Question';
 
+interface InspectedConfig {
+    inline: boolean;
+    markQuestions?: boolean;
+}
+
 /**
  * @desc
  *  Provides a human-readable description of the {@link Answerable<T>}.
@@ -10,27 +15,29 @@ import { Question } from '../screenplay/Question';
  *
  * @public
  * @param {Answerable<any>} value
+ * @param config
+ *  - inline - Return a single-line string instead of the default potentially multi-line description
+ *  - markQuestions - Surround the description of async values, such as Promises and Questions with <<value>>
  * @return {string}
  */
-export function inspected(value: Answerable<any>): string {
+export function inspected(value: Answerable<any>, config?: InspectedConfig): string {
+
+    const { inline, markQuestions } = { inline: false, markQuestions: false, ...config };
+
     if (! isDefined(value)) {
         return inspect(value);
     }
 
     if (Array.isArray(value)) {
-        return [
-            '[',
-            value.map(item => `  ${ inspected(item) }`).join(',\n'),
-            ']',
-        ].join('\n');
+        return stringifiedArray(value, inline);
     }
 
     if (isAPromise(value)) {
-        return `a Promise`;
+        return markAs('Promise', true);
     }
 
     if (Question.isAQuestion(value)) {
-        return value.toString();
+        return markAs(value.toString(), markQuestions);
     }
 
     if (isADate(value)) {
@@ -45,15 +52,49 @@ export function inspected(value: Answerable<any>): string {
         return value.inspect();
     }
 
-    if (isANamedFunction(value)) {
-        return `${ value.name } property`;
+    if (isAFunction(value)) {
+        return hasName(value)
+            ? value.name
+            : markAs(`Function`, true);
     }
 
     if (! hasCustomInspectionFunction(value) && isPlainObject(value) && isSerialisableAsJSON(value)) {
-        return JSON.stringify(value, undefined, 4);
+        return stringifiedToJson(value, inline);
     }
 
-    return inspect(value, { breakLength: Number.POSITIVE_INFINITY, compact: true, sorted: false  });
+    return inspect(value, { breakLength: Number.POSITIVE_INFINITY, compact: inline ? 3 : false, sorted: false  });
+}
+
+function stringifiedToJson(value: any, inline: boolean): string {
+    const indentation = inline ? 0 : 4;
+
+    return JSON.stringify(value, undefined, indentation);
+}
+
+function stringifiedArray(value: any[], inline: boolean): string {
+    const indentation   = inline ? '' : '  ';
+    const separator     = inline ? ' ' : '\n';
+
+    const inspectedItem = (item: unknown, index: number) =>
+        [
+            indentation,
+            inspected(item, { inline, markQuestions: true }),
+            index < value.length - 1 ? ',' : ''
+        ].join('')
+
+    return [
+        '[',
+        ...value.map(inspectedItem),
+        ']',
+    ].join(separator);
+}
+
+function markAs(value: string, markValue: boolean): string {
+    const [left, right] = markValue && ! value.startsWith('<<')
+        ? [ '<<', '>>' ]
+        : ['', ''];
+
+    return [ left, value, right ].join('');
 }
 
 /**
@@ -121,8 +162,19 @@ function isAPromise<T>(v: Answerable<T>): v is Promise<T> {
  * @private
  * @param {Answerable<any>} v
  */
-function isANamedFunction(v: any): v is { name: string } {
-    return Object.prototype.toString.call(v) === '[object Function]' && (v as any).name !== '';
+function isAFunction(v: any): v is Function {       // eslint-disable-line @typescript-eslint/ban-types
+    return Object.prototype.toString.call(v) === '[object Function]';
+}
+
+/**
+ * @desc
+ *  Checks if the value is has a property called 'name' with a non-empty value.
+ *
+ * @private
+ * @param {Answerable<any>} v
+ */
+function hasName(v: any): v is { name: string } {
+    return typeof (v as any).name === 'string' && (v as any).name !== '';
 }
 
 /**

package/src/model/Timestamp.ts

@@ -8,7 +8,11 @@ export class Timestamp extends TinyType {
         return new Timestamp(new Date(ensure(Timestamp.name, v, isSerialisedISO8601Date())));
     }
 
-    static fromMillisecondTimestamp(v: number): Timestamp {
+    static fromTimestampInSeconds(v: number): Timestamp {
+        return Timestamp.fromTimestampInMilliseconds(v * 1000);
+    }
+
+    static fromTimestampInMilliseconds(v: number): Timestamp {
         return new Timestamp(moment(v).toDate());
     }
 
@@ -29,10 +33,14 @@ export class Timestamp extends TinyType {
         return new Timestamp(moment(this.value).subtract(duration.inMilliseconds(), 'ms').toDate());
     }
 
-    toMillisecondTimestamp(): number {
+    toMilliseconds(): number {
         return moment(this.value).valueOf();
     }
 
+    toSeconds(): number {
+        return moment(this.value).unix();
+    }
+
     toJSON(): string {
         return this.value.toJSON();
     }

package/src/screenplay/Question.ts

@@ -1,6 +1,6 @@
-import { isMappable, Mappable } from '../io/collections';
+import { inspected } from '../io/inspected';
 import { AnswersQuestions, UsesAbilities } from './actor';
-import { AnswerMappingFunction } from './questions/mappings';
+import { Adapter, createAdapter } from './model';
 
 /**
  * @desc
@@ -53,15 +53,6 @@ import { AnswerMappingFunction } from './questions/mappings';
  */
 export abstract class Question<T> {
 
-    /**
-     * @param {string} subject
-     *  The subject of this question
-     *
-     * @protected
-     */
-    protected constructor(protected subject: string) {
-    }
-
     /**
      * @desc
      *  Factory method that simplifies the process of defining custom questions.
@@ -77,8 +68,8 @@ export abstract class Question<T> {
      *
      * @returns {Question<R>}
      */
-    static about<R>(description: string, body: (actor: AnswersQuestions & UsesAbilities) => R): Question<R> {
-        return new AnonymousQuestion<R>(description, body);
+    static about<R>(description: string, body: (actor: AnswersQuestions & UsesAbilities) => R): Question<R> & Adapter<Awaited<R>> {
+        return createAdapter<R>(new AnonymousQuestion<R>(description, body));
     }
 
     /**
@@ -102,9 +93,7 @@ export abstract class Question<T> {
      *
      * @returns {string}
      */
-    toString(): string {
-        return this.subject;
-    }
+    abstract toString(): string;
 
     /**
      * @desc
@@ -113,122 +102,31 @@ export abstract class Question<T> {
      * @param {string} subject
      * @returns {Question<T>}
      */
-    describedAs(subject: string): this {
-        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<O>(mapping: AnswerMappingFunction<AnswerOrItemOfMappableCollection<T>, O>): Question<Promise<Mapped<T, O>>> {
-        return Question.about(this.subject, actor =>
-            actor.answer(this).then(value =>
-                (isMappable(value)
-                    ? Promise.all(((value).map(mapping(actor)) as Array<PromiseLike<O> | O>))
-                    : mapping(actor)(value as AnswerOrItemOfMappableCollection<T>)
-                ) as Promise<Mapped<T, O>>
-            )
-        ) as 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;
-}
-
-/**
- * @package
- */
-type AnswerOrItemOfMappableCollection<V> =
-    V extends PromiseLike<infer PromisedValue>
-        ? PromisedValue extends Mappable<infer Item>
-            ? Item
-            : PromisedValue
-        : V extends Mappable<infer Item>
-            ? Item
-            : V;
 
-/**
- * @package
- */
-type Mapped<T, O> =
-    T extends PromiseLike<infer PromisedValue>
-        ? PromisedValue extends Mappable<infer Item>        // eslint-disable-line @typescript-eslint/no-unused-vars
-            ? O[]
-            : O
-        : T extends Mappable<infer Item>                    // eslint-disable-line @typescript-eslint/no-unused-vars
-            ? O[]
-            : O
+    public as<O>(mapping: (answer: Awaited<T>) => Promise<O> | O): Question<Promise<O>> {
+        return Question.about<Promise<O>>(`${ this.toString() } as ${ inspected(mapping, { inline: true }) }`, async actor => {
+            const answer = (await actor.answer(this)) as Awaited<T>;
+            return mapping(answer);
+        });
+    }
+}
 
 /**
  * @package
  */
 class AnonymousQuestion<T> extends Question<T> {
-    constructor(private description: string, private body: (actor: AnswersQuestions & UsesAbilities) => T) {
-        super(description);
+    constructor(private subject: string, private body: (actor: AnswersQuestions & UsesAbilities) => T) {
+        super();
     }
 
-    answeredBy(actor: AnswersQuestions & UsesAbilities) {
+    answeredBy(actor: AnswersQuestions & UsesAbilities): T {
         return this.body(actor);
     }
 
@@ -244,4 +142,8 @@ class AnonymousQuestion<T> extends Question<T> {
 
         return this;
     }
+
+    toString(): string {
+        return this.subject;
+    }
 }

package/src/screenplay/actor/Actor.ts

@@ -114,11 +114,11 @@ export class Actor implements
      */
     answer<T>(answerable: Answerable<T>): Promise<T> {
         function isAPromise<V>(v: Answerable<V>): v is Promise<V> {
-            return !!(v as any).then;
+            return Object.prototype.hasOwnProperty.call(v, 'then');
         }
 
         function isDefined<V>(v: Answerable<V>) {
-            return ! (answerable === undefined || answerable === null);
+            return ! (v === undefined || v === null);
         }
 
         if (isDefined(answerable) && isAPromise(answerable)) {

package/src/screenplay/index.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/src/screenplay/model/Adapter.ts

@@ -0,0 +1,14 @@
+import { Answerable } from '../Answerable';
+import { Interaction } from '../Interaction';
+import { Question } from '../Question';
+
+export type Adapter<OriginalType> = {
+    [Field in keyof Omit<OriginalType, keyof Question<OriginalType>>]:
+    // is it a method?
+    OriginalType[Field] extends (...args: infer OriginalParameters) => infer OriginalMethodResult
+    // make the method signature asynchronous, accepting Answerables and returning a Promise
+        ? (...args: { [P in keyof OriginalParameters]: Answerable<OriginalParameters[P]> }) =>  Question<Promise<Awaited<OriginalMethodResult>>> & Interaction & Adapter<Awaited<OriginalMethodResult>>
+    // is it an object? wrap each field
+        : Question<Promise<Awaited<OriginalType[Field]>>> & Interaction & Adapter<Awaited<OriginalType[Field]>>
+}
+