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

package/lib/io/format.d.ts

@@ -0,0 +1,39 @@
+import { Answerable } from '../screenplay';
+/**
+ * @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 declare function format(config: {
+    markQuestions: boolean;
+}): (templates: TemplateStringsArray, ...placeholders: Array<Answerable<any>>) => string;
+export declare const f: (templates: TemplateStringsArray, ...placeholders: Array<Answerable<any>>) => string;
+export declare const d: (templates: TemplateStringsArray, ...placeholders: Array<Answerable<any>>) => string;

package/lib/io/format.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.d = exports.f = exports.format = void 0;
+const inspected_1 = require("./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}
+ */
+function format(config) {
+    return (templates, ...placeholders) => {
+        return templates
+            .map((template, i) => i < placeholders.length
+            ? [template, (0, inspected_1.inspected)(placeholders[i], { inline: true, markQuestions: config.markQuestions })]
+            : [template])
+            .reduce((acc, tuple) => acc.concat(tuple))
+            .join('');
+    };
+}
+exports.format = format;
+exports.f = format({ markQuestions: true });
+exports.d = format({ markQuestions: false });
+//# sourceMappingURL=format.js.map

package/lib/io/format.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/io/format.ts"],"names":[],"mappings":";;;AACA,2CAAwC;AAExC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,SAAgB,MAAM,CAAC,MAAkC;IACrD,OAAO,CAAC,SAA+B,EAAE,GAAG,YAAoC,EAAU,EAAE;QACxF,OAAO,SAAS;aACX,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,YAAY,CAAC,MAAM;YACzC,CAAC,CAAC,CAAE,QAAQ,EAAE,IAAA,qBAAS,EAAC,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,CAAC,aAAa,EAAE,CAAC,CAAE;YACjG,CAAC,CAAC,CAAE,QAAQ,CAAE,CAAC;aAClB,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aACzC,IAAI,CAAC,EAAE,CAAC,CAAC;IAClB,CAAC,CAAA;AACL,CAAC;AATD,wBASC;AAEY,QAAA,CAAC,GAAG,MAAM,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;AACpC,QAAA,CAAC,GAAG,MAAM,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC"}

package/lib/io/formatted.d.ts

@@ -1,10 +1,14 @@
-import { Answerable } from '../screenplay/Answerable';
+import { Answerable } from '../screenplay';
 /**
  * @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}

package/lib/io/formatted.js

@@ -1,30 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatted = void 0;
-const inspected_1 = require("./inspected");
+const format_1 = require("./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}
  */
 function formatted(templates, ...placeholders) {
-    return templates
-        .map((template, i) => i < placeholders.length
-        ? [template, compacted((0, inspected_1.inspected)(placeholders[i]))]
-        : [template])
-        .reduce((acc, tuple) => acc.concat(tuple))
-        .join('');
+    return (0, format_1.format)({ markQuestions: false })(templates, ...placeholders);
 }
 exports.formatted = formatted;
-/** @private */
-function compacted(multiline) {
-    return multiline
-        .replace(/\r?\n/g, ' ')
-        .replace(/\s+/g, ' ');
-}
 //# sourceMappingURL=formatted.js.map

package/lib/io/formatted.js.map

@@ -1 +1 @@
-{"version":3,"file":"formatted.js","sourceRoot":"","sources":["../../src/io/formatted.ts"],"names":[],"mappings":";;;AACA,2CAAwC;AAExC;;;;;;;;;GASG;AACH,SAAgB,SAAS,CAAC,SAA+B,EAAE,GAAG,YAAoC;IAC9F,OAAO,SAAS;SACX,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,YAAY,CAAC,MAAM;QACzC,CAAC,CAAC,CAAE,QAAQ,EAAE,SAAS,CAAC,IAAA,qBAAS,EAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAE;QACrD,CAAC,CAAC,CAAE,QAAQ,CAAE,CAAC;SAClB,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SACzC,IAAI,CAAC,EAAE,CAAC,CAAC;AAClB,CAAC;AAPD,8BAOC;AAED,eAAe;AACf,SAAS,SAAS,CAAC,SAAiB;IAChC,OAAO,SAAS;SACX,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC;SACtB,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAC9B,CAAC"}
+{"version":3,"file":"formatted.js","sourceRoot":"","sources":["../../src/io/formatted.ts"],"names":[],"mappings":";;;AACA,qCAAkC;AAElC;;;;;;;;;;;;;GAaG;AACH,SAAgB,SAAS,CAAC,SAA+B,EAAE,GAAG,YAAoC;IAC9F,OAAO,IAAA,eAAM,EAAC,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC,SAAS,EAAE,GAAG,YAAY,CAAC,CAAC;AACxE,CAAC;AAFD,8BAEC"}

package/lib/io/index.d.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/lib/io/index.js

@@ -11,7 +11,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./AssertionReportDiffer"), exports);
-__exportStar(require("./collections"), exports);
+__exportStar(require("./asyncMap"), exports);
 __exportStar(require("./commaSeparated"), exports);
 __exportStar(require("./Config"), exports);
 __exportStar(require("./ErrorSerialiser"), exports);
@@ -19,6 +19,7 @@ __exportStar(require("./ErrorStackParser"), exports);
 __exportStar(require("./FileFinder"), exports);
 __exportStar(require("./FileSystem"), exports);
 __exportStar(require("./FileSystemLocation"), exports);
+__exportStar(require("./format"), exports);
 __exportStar(require("./formatted"), exports);
 __exportStar(require("./json"), exports);
 __exportStar(require("./ModuleLoader"), exports);

package/lib/io/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/io/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0DAAwC;AACxC,gDAA8B;AAC9B,mDAAiC;AACjC,2CAAyB;AACzB,oDAAkC;AAClC,qDAAmC;AACnC,+CAA6B;AAC7B,+CAA6B;AAC7B,uDAAqC;AACrC,8CAA4B;AAC5B,yCAAuB;AACvB,iDAA+B;AAC/B,iDAA+B;AAC/B,yCAAuB;AACvB,+CAA6B;AAC7B,sDAAoC;AACpC,4CAA0B;AAC1B,4CAA0B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/io/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0DAAwC;AACxC,6CAA2B;AAC3B,mDAAiC;AACjC,2CAAyB;AACzB,oDAAkC;AAClC,qDAAmC;AACnC,+CAA6B;AAC7B,+CAA6B;AAC7B,uDAAqC;AACrC,2CAAyB;AACzB,8CAA4B;AAC5B,yCAAuB;AACvB,iDAA+B;AAC/B,iDAA+B;AAC/B,yCAAuB;AACvB,+CAA6B;AAC7B,sDAAoC;AACpC,4CAA0B;AAC1B,4CAA0B"}

package/lib/io/inspected.d.ts

@@ -1,4 +1,8 @@
 import { Answerable } from '../screenplay/Answerable';
+interface InspectedConfig {
+    inline: boolean;
+    markQuestions?: boolean;
+}
 /**
  * @desc
  *  Provides a human-readable description of the {@link Answerable<T>}.
@@ -6,6 +10,10 @@ import { Answerable } from '../screenplay/Answerable';
  *
  * @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 declare function inspected(value: Answerable<any>): string;
+export declare function inspected(value: Answerable<any>, config?: InspectedConfig): string;
+export {};

package/lib/io/inspected.js

@@ -10,24 +10,24 @@ const Question_1 = require("../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}
  */
-function inspected(value) {
+function inspected(value, config) {
+    const { inline, markQuestions } = { inline: false, markQuestions: false, ...config };
     if (!isDefined(value)) {
         return (0, util_1.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_1.Question.isAQuestion(value)) {
-        return value.toString();
+        return markAs(value.toString(), markQuestions);
     }
     if (isADate(value)) {
         return value.toISOString();
@@ -38,15 +38,41 @@ function inspected(value) {
     if (isInspectable(value)) {
         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 (0, util_1.inspect)(value, { breakLength: Number.POSITIVE_INFINITY, compact: true, sorted: false });
+    return (0, util_1.inspect)(value, { breakLength: Number.POSITIVE_INFINITY, compact: inline ? 3 : false, sorted: false });
 }
 exports.inspected = inspected;
+function stringifiedToJson(value, inline) {
+    const indentation = inline ? 0 : 4;
+    return JSON.stringify(value, undefined, indentation);
+}
+function stringifiedArray(value, inline) {
+    const indentation = inline ? '' : '  ';
+    const separator = inline ? ' ' : '\n';
+    const inspectedItem = (item, index) => [
+        indentation,
+        inspected(item, { inline, markQuestions: true }),
+        index < value.length - 1 ? ',' : ''
+    ].join('');
+    return [
+        '[',
+        ...value.map(inspectedItem),
+        ']',
+    ].join(separator);
+}
+function markAs(value, markValue) {
+    const [left, right] = markValue && !value.startsWith('<<')
+        ? ['<<', '>>']
+        : ['', ''];
+    return [left, value, right].join('');
+}
 /**
  * @desc
  * Checks if the value is defined
@@ -98,7 +124,8 @@ function isADate(v) {
  * @param {Answerable<any>} v
  */
 function isAPromise(v) {
-    return !!v.then;
+    return typeof v === 'object'
+        && 'then' in v;
 }
 /**
  * @desc
@@ -107,8 +134,18 @@ function isAPromise(v) {
  * @private
  * @param {Answerable<any>} v
  */
-function isANamedFunction(v) {
-    return Object.prototype.toString.call(v) === '[object Function]' && v.name !== '';
+function isAFunction(v) {
+    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) {
+    return typeof v.name === 'string' && v.name !== '';
 }
 /**
  * @desc

package/lib/io/inspected.js.map

@@ -1 +1 @@
-{"version":3,"file":"inspected.js","sourceRoot":"","sources":["../../src/io/inspected.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAG/B,qDAAkD;AAElD;;;;;;;;GAQG;AACH,SAAgB,SAAS,CAAC,KAAsB;IAC5C,IAAI,CAAE,SAAS,CAAC,KAAK,CAAC,EAAE;QACpB,OAAO,IAAA,cAAO,EAAC,KAAK,CAAC,CAAC;KACzB;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACtB,OAAO;YACH,GAAG;YACH,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,KAAM,SAAS,CAAC,IAAI,CAAE,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;YACvD,GAAG;SACN,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KAChB;IAED,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE;QACnB,OAAO,WAAW,CAAC;KACtB;IAED,IAAI,mBAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;QAC7B,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;KAC3B;IAED,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE;QAChB,OAAO,KAAK,CAAC,WAAW,EAAE,CAAC;KAC9B;IAED,IAAI,iBAAiB,CAAC,KAAK,CAAC,EAAE;QAC1B,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;KAC3B;IAED,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE;QACtB,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC;KAC1B;IAED,IAAI,gBAAgB,CAAC,KAAK,CAAC,EAAE;QACzB,OAAO,GAAI,KAAK,CAAC,IAAK,WAAW,CAAC;KACrC;IAED,IAAI,CAAE,2BAA2B,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,IAAI,oBAAoB,CAAC,KAAK,CAAC,EAAE;QAC7F,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;KAC9C;IAED,OAAO,IAAA,cAAO,EAAC,KAAK,EAAE,EAAE,WAAW,EAAE,MAAM,CAAC,iBAAiB,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAG,CAAC,CAAC;AACpG,CAAC;AA1CD,8BA0CC;AAED;;;;;;GAMG;AACH,SAAS,SAAS,CAAC,CAAkB;IACjC,OAAO,CAAC,CAAE,CAAC,CAAC;AAChB,CAAC;AAED;;;;;;GAMG;AACH,SAAS,iBAAiB,CAAC,CAAkB;IACzC,OAAO,OAAO,CAAC,KAAK,QAAQ;WACrB,CAAC,CAAG,CAAS,CAAC,QAAQ;WACtB,OAAQ,CAAS,CAAC,QAAQ,KAAK,UAAU;WACzC,CAAE,QAAQ,CAAE,CAAS,CAAC,QAAQ,CAAC,CAAC;AAC3C,CAAC;AAED;;;;;;GAMG;AACH,SAAS,aAAa,CAAC,CAAkB;IACrC,OAAO,CAAC,CAAG,CAAS,CAAC,OAAO,IAAI,OAAQ,CAAS,CAAC,OAAO,KAAK,UAAU,CAAC;AAC7E,CAAC;AAED;;;;;;GAMG;AACH,SAAS,OAAO,CAAC,CAAkB;IAC/B,OAAO,CAAC,YAAY,IAAI,CAAC;AAC7B,CAAC;AAED;;;;;;GAMG;AACH,SAAS,UAAU,CAAI,CAAgB;IACnC,OAAO,CAAC,CAAG,CAAS,CAAC,IAAI,CAAC;AAC9B,CAAC;AAED;;;;;;GAMG;AACH,SAAS,gBAAgB,CAAC,CAAM;IAC5B,OAAO,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,mBAAmB,IAAK,CAAS,CAAC,IAAI,KAAK,EAAE,CAAC;AAC/F,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,2BAA2B,CAAC,CAAkB;IACnD,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC,CAAC;AAC5D,CAAC;AAED;;;;;;GAMG;AACH,SAAS,aAAa,CAAC,CAAkB;IAErC,8CAA8C;IAC9C,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,EAAE;QAErC,6CAA6C;QAC7C,IAAI,OAAO,MAAM,CAAC,cAAc,KAAK,UAAU,EAAE;YAC7C,MAAM,KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;YACvC,OAAO,KAAK,KAAK,MAAM,CAAC,SAAS,IAAI,KAAK,KAAK,IAAI,CAAC;SACvD;QAED,gCAAgC;QAChC,yEAAyE;QACzE,OAAO,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,iBAAiB,CAAC;KAClE;IAED,gBAAgB;IAChB,OAAO,KAAK,CAAC;AACjB,CAAC;AAED;;;;;;GAMG;AACH,SAAS,oBAAoB,CAAC,CAAM;IAChC,IAAI;QACA,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAElB,OAAO,IAAI,CAAC;KACf;IAAC,MAAM;QACJ,OAAO,KAAK,CAAC;KAChB;AACL,CAAC;AAED;;;GAGG;AACH,SAAS,QAAQ,CAAC,CAAM;IAEpB,MACI,QAAQ,GAAU,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAK,qDAAqD;IACrG,UAAU,GAAQ,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAG,qDAAqD;IACrG,eAAe,GAAG,4BAA4B,CAAC,CAAC,6EAA6E;IAEjI,+DAA+D;IAC/D,wFAAwF;IACxF,MAAM,sBAAsB,GAAG,IAAI,MAAM,CACrC,GAAG;QACH,uCAAuC;QACvC,MAAM,CAAC,QAAQ,CAAC;YAChB,uCAAuC;aAClC,OAAO,CAAC,sBAAsB,EAAG,MAAM,CAAC;YACzC,0EAA0E;YAC1E,uFAAuF;YACvF,wBAAwB;aACvB,OAAO,CAAC,iDAAiD,EAAE,OAAO,CAAC;QACxE,GAAG,CACN,CAAC;IAEF,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC;IACtB,OAAO,IAAI,KAAK,UAAU;QACtB,sEAAsE;QACtE,6BAA6B;QAC7B,CAAC,CAAC,sBAAsB,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjD,2EAA2E;QAC3E,uEAAuE;QACvE,yBAAyB;QACzB,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,KAAK,QAAQ,IAAI,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC;AACtF,CAAC"}
+{"version":3,"file":"inspected.js","sourceRoot":"","sources":["../../src/io/inspected.ts"],"names":[],"mappings":"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"}

package/lib/model/Timestamp.d.ts

@@ -3,12 +3,14 @@ import { Duration } from './Duration';
 export declare class Timestamp extends TinyType {
     readonly value: Date;
     static fromJSON(v: string): Timestamp;
-    static fromMillisecondTimestamp(v: number): Timestamp;
+    static fromTimestampInSeconds(v: number): Timestamp;
+    static fromTimestampInMilliseconds(v: number): Timestamp;
     constructor(value?: Date);
     diff(another: Timestamp): Duration;
     plus(duration: Duration): Timestamp;
     less(duration: Duration): Timestamp;
-    toMillisecondTimestamp(): number;
+    toMilliseconds(): number;
+    toSeconds(): number;
     toJSON(): string;
     toString(): string;
 }

package/lib/model/Timestamp.js

@@ -13,7 +13,10 @@ class Timestamp extends tiny_types_1.TinyType {
     static fromJSON(v) {
         return new Timestamp(new Date((0, tiny_types_1.ensure)(Timestamp.name, v, isSerialisedISO8601Date())));
     }
-    static fromMillisecondTimestamp(v) {
+    static fromTimestampInSeconds(v) {
+        return Timestamp.fromTimestampInMilliseconds(v * 1000);
+    }
+    static fromTimestampInMilliseconds(v) {
         return new Timestamp(moment(v).toDate());
     }
     diff(another) {
@@ -25,9 +28,12 @@ class Timestamp extends tiny_types_1.TinyType {
     less(duration) {
         return new Timestamp(moment(this.value).subtract(duration.inMilliseconds(), 'ms').toDate());
     }
-    toMillisecondTimestamp() {
+    toMilliseconds() {
         return moment(this.value).valueOf();
     }
+    toSeconds() {
+        return moment(this.value).unix();
+    }
     toJSON() {
         return this.value.toJSON();
     }

package/lib/model/Timestamp.js.map

@@ -1 +1 @@
-{"version":3,"file":"Timestamp.js","sourceRoot":"","sources":["../../src/model/Timestamp.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AACjC,2CAAkF;AAElF,yCAAsC;AAEtC,MAAa,SAAU,SAAQ,qBAAQ;IASnC,YAA4B,QAAc,IAAI,IAAI,EAAE;QAChD,KAAK,EAAE,CAAC;QADgB,UAAK,GAAL,KAAK,CAAmB;QAEhD,IAAA,mBAAM,EAAC,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,IAAA,sBAAS,GAAE,EAAE,IAAA,yBAAY,EAAC,IAAI,CAAC,CAAC,CAAC;IACnE,CAAC;IAXD,MAAM,CAAC,QAAQ,CAAC,CAAS;QACrB,OAAO,IAAI,SAAS,CAAC,IAAI,IAAI,CAAC,IAAA,mBAAM,EAAC,SAAS,CAAC,IAAI,EAAE,CAAC,EAAE,uBAAuB,EAAE,CAAC,CAAC,CAAC,CAAC;IACzF,CAAC;IAED,MAAM,CAAC,wBAAwB,CAAC,CAAS;QACrC,OAAO,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7C,CAAC;IAOD,IAAI,CAAC,OAAkB;QACnB,OAAO,IAAI,mBAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IACtF,CAAC;IAED,IAAI,CAAC,QAAkB;QACnB,OAAO,IAAI,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,cAAc,EAAE,EAAE,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IAC3F,CAAC;IAED,IAAI,CAAC,QAAkB;QACnB,OAAO,IAAI,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,cAAc,EAAE,EAAE,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IAChG,CAAC;IAED,sBAAsB;QAClB,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;IACxC,CAAC;IAED,MAAM;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;IAC/B,CAAC;IAED,QAAQ;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;IACjC,CAAC;CACJ;AArCD,8BAqCC;AAED,SAAS,uBAAuB;IAC5B,OAAO,sBAAS,CAAC,EAAE,CAAC,+BAA+B,EAAE,CAAC,KAAa,EAAE,EAAE,CACnE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;AACxD,CAAC"}
+{"version":3,"file":"Timestamp.js","sourceRoot":"","sources":["../../src/model/Timestamp.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AACjC,2CAAkF;AAElF,yCAAsC;AAEtC,MAAa,SAAU,SAAQ,qBAAQ;IAanC,YAA4B,QAAc,IAAI,IAAI,EAAE;QAChD,KAAK,EAAE,CAAC;QADgB,UAAK,GAAL,KAAK,CAAmB;QAEhD,IAAA,mBAAM,EAAC,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,IAAA,sBAAS,GAAE,EAAE,IAAA,yBAAY,EAAC,IAAI,CAAC,CAAC,CAAC;IACnE,CAAC;IAfD,MAAM,CAAC,QAAQ,CAAC,CAAS;QACrB,OAAO,IAAI,SAAS,CAAC,IAAI,IAAI,CAAC,IAAA,mBAAM,EAAC,SAAS,CAAC,IAAI,EAAE,CAAC,EAAE,uBAAuB,EAAE,CAAC,CAAC,CAAC,CAAC;IACzF,CAAC;IAED,MAAM,CAAC,sBAAsB,CAAC,CAAS;QACnC,OAAO,SAAS,CAAC,2BAA2B,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,CAAC,2BAA2B,CAAC,CAAS;QACxC,OAAO,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7C,CAAC;IAOD,IAAI,CAAC,OAAkB;QACnB,OAAO,IAAI,mBAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IACtF,CAAC;IAED,IAAI,CAAC,QAAkB;QACnB,OAAO,IAAI,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,cAAc,EAAE,EAAE,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IAC3F,CAAC;IAED,IAAI,CAAC,QAAkB;QACnB,OAAO,IAAI,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,cAAc,EAAE,EAAE,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IAChG,CAAC;IAED,cAAc;QACV,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;IACxC,CAAC;IAED,SAAS;QACL,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;IACrC,CAAC;IAED,MAAM;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;IAC/B,CAAC;IAED,QAAQ;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;IACjC,CAAC;CACJ;AA7CD,8BA6CC;AAED,SAAS,uBAAuB;IAC5B,OAAO,sBAAS,CAAC,EAAE,CAAC,+BAA+B,EAAE,CAAC,KAAa,EAAE,EAAE,CACnE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;AACxD,CAAC"}

package/lib/screenplay/Optional.d.ts

@@ -0,0 +1,29 @@
+import { Answerable } from './Answerable';
+/**
+ * @desc
+ *  `Optional` is a container object, which holds a value that may or may not be "present",
+ *
+ *  The meaning of being "present" depends on the context and typically means a value that:
+ *  - is other than `null` or `undefined`
+ *  - is retrievable, so retrieving it doesn't throw any errors
+ *
+ *  Additionally, `Optional` can also have a context-specific meaning. For example, `Optional#isPresent()`:
+ *  - in the context of a `PageElement` means that the element exists in the DOM.
+ *  - in the context of a `ModalWindow` means that the modal window is open.
+ *  - in the case of a REST API response, `LastResponse.body().books[0].author.name.isPresent()`
+ *    will inform us if a given entry exists (so `books[0].author.name`),
+ *    and if all the links of the property chain leading to the entry of interest exist too
+ *    (so `books` is present, and so is `books[0]`, `books[0].author`, `books[0].author.name`).
+ *
+ * @public
+ */
+export interface Optional {
+    /**
+     * @desc
+     *  Returns an {@link Answerable} that resolves to `true` when the optional value
+     *  is present, `false` otherwise.
+     *
+     * @returns {Answerable<boolean>}
+     */
+    isPresent(): Answerable<boolean>;
+}

package/lib/{io/collections/reducible.js → screenplay/Optional.js}

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

package/lib/screenplay/Optional.js.map

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

package/lib/screenplay/Question.d.ts

@@ -1,6 +1,7 @@
-import { Mappable } from '../io/collections';
 import { AnswersQuestions, UsesAbilities } from './actor';
-import { AnswerMappingFunction } from './questions/mappings';
+import { Answerable } from './Answerable';
+import { Interaction } from './Interaction';
+import { Optional } from './Optional';
 /**
  * @desc
  *  Enables the {@link Actor} to query the system under test.
@@ -51,14 +52,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 +67,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) => Promise<R> | R): QuestionAdapter<Awaited<R>>;
     /**
      * @desc
      *  Checks if the value is a {@link Question}.
@@ -87,13 +80,14 @@ export declare abstract class Question<T> {
      * @returns {boolean}
      */
     static isAQuestion<T>(maybeQuestion: unknown): maybeQuestion is Question<T>;
+    protected static createAdapter<AT>(statement: Question<AT>): QuestionAdapter<Awaited<AT>>;
     /**
      * @desc
      *  Describes the subject of this {@link Question}.
      *
      * @returns {string}
      */
-    toString(): string;
+    abstract toString(): string;
     /**
      * @desc
      *  Changes the description of this question's subject.
@@ -101,79 +95,44 @@ 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
      */
     abstract answeredBy(actor: AnswersQuestions & UsesAbilities): T;
+    as<O>(mapping: (answer: Awaited<T>) => Promise<O> | O): QuestionAdapter<O>;
+}
+declare global {
+    interface ProxyConstructor {
+        new <Source_Type extends object, Target_Type extends object>(target: Source_Type, handler: ProxyHandler<Source_Type>): Target_Type;
+    }
+}
+export declare type ProxiedAnswer<Original_Type> = {
+    [Field in keyof Omit<Original_Type, keyof QuestionStatement<Original_Type>>]: Original_Type[Field] extends (...args: infer OriginalParameters) => infer OriginalMethodResult ? (...args: {
+        [P in keyof OriginalParameters]: Answerable<OriginalParameters[P]>;
+    }) => {
+        isPresent(): Question<Promise<boolean>>;
+    } & QuestionAdapter<Awaited<OriginalMethodResult>> : {
+        isPresent(): Question<Promise<boolean>>;
+    } & QuestionAdapter<Awaited<Original_Type[Field]>>;
+};
+export declare type QuestionAdapter<Original_Type> = Question<Promise<Original_Type>> & Interaction & Optional & ProxiedAnswer<Original_Type>;
+declare class QuestionStatement<Answer_Type> extends Interaction implements Question<Promise<Answer_Type>>, Optional {
+    private subject;
+    private readonly body;
+    constructor(subject: string, body: (actor: AnswersQuestions & UsesAbilities, ...Parameters: any[]) => Promise<Answer_Type> | Answer_Type);
+    /**
+     * @desc
+     *  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.
+     *
+     * @returns {Question<Promise<boolean>>}
+     */
+    isPresent(): Question<Promise<boolean>>;
+    answeredBy(actor: AnswersQuestions & UsesAbilities): Promise<Answer_Type>;
+    performAs(actor: UsesAbilities & AnswersQuestions): Promise<void>;
+    describedAs(subject: string): this;
+    toString(): string;
+    as<O>(mapping: (answer: Awaited<Answer_Type>) => (Promise<O> | O)): QuestionAdapter<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 {};