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

package/CHANGELOG.md

@@ -3,6 +3,82 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-rc.3](https://github.com/serenity-js/serenity-js/compare/v3.0.0-rc.2...v3.0.0-rc.3) (2021-12-29)
+
+
+### Bug Fixes
+
+* **core:** refactored Mappable so that it's easier to implement filters ([176e0cd](https://github.com/serenity-js/serenity-js/commit/176e0cd0303d63271477b2b7a8e7b0572dda99a0)), closes [#1074](https://github.com/serenity-js/serenity-js/issues/1074)
+* **core:** removed interface Reducible since it's not used any more ([1e9f23b](https://github.com/serenity-js/serenity-js/commit/1e9f23b227e3c4509dd52d6885cde5d3ecd1d102))
+* **deps:** updated tiny-types to 1.17.0 ([3187051](https://github.com/serenity-js/serenity-js/commit/3187051594158b4b450c82e851e417fd2ed21652))
+* **web:** corrected synchronisation in Web questions and interactions ([c3a0ad1](https://github.com/serenity-js/serenity-js/commit/c3a0ad16de311e71d7e82e4f463baa0ca6b18863))
+
+
+### Features
+
+* **core:** forEach for List and PageElements ([4592fb7](https://github.com/serenity-js/serenity-js/commit/4592fb7e700bad17fd44d91bd9db169839802d01)), closes [#823](https://github.com/serenity-js/serenity-js/issues/823)
+* **core:** List supports custom collectors ([cd3f2bc](https://github.com/serenity-js/serenity-js/commit/cd3f2bc1b536c8e56714aecd669bfed7ab078e0a))
+* **core:** new implementation of List.where filters ([45b3c80](https://github.com/serenity-js/serenity-js/commit/45b3c8080ca467ac6362e5217e7899ca36a04cdc)), closes [#1074](https://github.com/serenity-js/serenity-js/issues/1074)
+* **core:** support for Screenplay-style collection filters and mapping (List.where & .eachMappedTo) ([3d3c02e](https://github.com/serenity-js/serenity-js/commit/3d3c02ebe0ec5c6865f91f1991fd59ef0190a16c)), closes [#1074](https://github.com/serenity-js/serenity-js/issues/1074)
+* **web:** re-introduced PageElements.where DSL and universal By selectors ([39fe0a1](https://github.com/serenity-js/serenity-js/commit/39fe0a10edf7f652e93911159e4a4689c36d6876)), closes [#1081](https://github.com/serenity-js/serenity-js/issues/1081)
+
+
+
+
+
+# [3.0.0-rc.1](https://github.com/serenity-js/serenity-js/compare/v3.0.0-rc.0...v3.0.0-rc.1) (2021-12-09)
+
+**Note:** Version bump only for package @serenity-js/core
+
+
+
+
+
+# [3.0.0-rc.0](https://github.com/serenity-js/serenity-js/compare/v2.32.5...v3.0.0-rc.0) (2021-12-08)
+
+
+### Bug Fixes
+
+* **core:** `formatted` can be configured to produce single- or multi-line descriptions ([21145a3](https://github.com/serenity-js/serenity-js/commit/21145a3dda17e87ea7bd950da4526b90f37a1edc))
+* **core:** `inspected` produces a better description of functions used as parameters ([15535c6](https://github.com/serenity-js/serenity-js/commit/15535c675469651b835c0b358649a590f2c15b5d))
+* **core:** 3.0 RC ([469d54e](https://github.com/serenity-js/serenity-js/commit/469d54e4f81ef430566b93852e3174826f8ef672)), closes [#805](https://github.com/serenity-js/serenity-js/issues/805)
+* **core:** answerProxy renamed to ProxyAnswer to better reflect its purpose ([a98fe41](https://github.com/serenity-js/serenity-js/commit/a98fe41378bc8475f027946e0f01a30f4789d57a))
+* **core:** corrected type defs of Question.as ([681ce22](https://github.com/serenity-js/serenity-js/commit/681ce22259bf75161df7ce2454f4b6d73ea87259))
+* **core:** exported createProxyAnswer to make it easier to use ([5471989](https://github.com/serenity-js/serenity-js/commit/547198985025d0ede2ab47ea89d8944960fb980d))
+* **core:** removed Loop as it will be replaced ([0b63d27](https://github.com/serenity-js/serenity-js/commit/0b63d27745c905001adf3c219dd0e3cf44756320))
+* **core:** removed Property as it will be replaced by new Question ([fd7fa10](https://github.com/serenity-js/serenity-js/commit/fd7fa10dfbaa0c0cba059c5f18920609c4bac014))
+* **core:** removed Transform and mapping functions as they'll be replaced with new Question ([506eaea](https://github.com/serenity-js/serenity-js/commit/506eaeaf2df22cfde5d7ca6a8f413fc053556c2b))
+* **core:** renamed "Model" type to "Adapter" to better reflect its purpose ([b4ea7a1](https://github.com/serenity-js/serenity-js/commit/b4ea7a100fac2c896990bf15cbc906de641196b8)), closes [#805](https://github.com/serenity-js/serenity-js/issues/805)
+* **cucumber:** support for recognising non-Serenity AssertionErrors in older version of Cucumber ([31e9e99](https://github.com/serenity-js/serenity-js/commit/31e9e9919c2fd1e87b3f4405d9b2a6ae0164e893))
+* **web:** wordsmithing of interface names ([5a1e76a](https://github.com/serenity-js/serenity-js/commit/5a1e76a9c162370e17238fcccc9f08e109d543c3))
+
+
+### Features
+
+* **core:** question.about creates a proxy around the answer to simplify the API ([25e0841](https://github.com/serenity-js/serenity-js/commit/25e084116ad28a02b55fbd8814b6ffa0375ec433))
+* **core:** question.about produces "props" that proxy the methods of the underlying model ([f771872](https://github.com/serenity-js/serenity-js/commit/f771872c56b487e404002c3800fc8f3baaed804f))
+* **web:** Page.url() and Page.title() replace Website.url() and Website.title() ([49fe009](https://github.com/serenity-js/serenity-js/commit/49fe0094422ab53ec67d4ba303f80c33e382eebd)), closes [#805](https://github.com/serenity-js/serenity-js/issues/805)
+* **web:** removed Target in favour of PageElement ([69496c4](https://github.com/serenity-js/serenity-js/commit/69496c47c4a1ec7b92e7ab6c83da1559e926f28e)), closes [#805](https://github.com/serenity-js/serenity-js/issues/805)
+* **web:** support for working with cookies ([39cde6d](https://github.com/serenity-js/serenity-js/commit/39cde6de7a36d27a8b1c596493efbec94900af6b)), closes [#805](https://github.com/serenity-js/serenity-js/issues/805)
+
+
+### BREAKING CHANGES
+
+* **core:** Introduced @serenity-js/web - a shared library for Serenity/JS Web integration
+modules such as @serenity-js/protractor and @serenity-js/webdriverio. Dropped support for Node 12.
+
+
+
+
+
+## [2.32.5](https://github.com/serenity-js/serenity-js/compare/v2.32.4...v2.32.5) (2021-12-08)
+
+**Note:** Version bump only for package @serenity-js/core
+
+
+
+
+
 ## [2.32.4](https://github.com/serenity-js/serenity-js/compare/v2.32.3...v2.32.4) (2021-11-25)
 
 **Note:** Version bump only for package @serenity-js/core

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

@@ -10,11 +10,14 @@ 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.SerenityConfig = exports.Duration = void 0;
+exports.SerenityConfig = exports.Timestamp = exports.Duration = exports.format = void 0;
 __exportStar(require("./errors"), exports);
 __exportStar(require("./instance"), exports);
+var io_1 = require("./io");
+Object.defineProperty(exports, "format", { enumerable: true, get: function () { return io_1.format; } });
 var model_1 = require("./model");
 Object.defineProperty(exports, "Duration", { enumerable: true, get: function () { return model_1.Duration; } });
+Object.defineProperty(exports, "Timestamp", { enumerable: true, get: function () { return model_1.Timestamp; } });
 __exportStar(require("./screenplay"), exports);
 __exportStar(require("./Serenity"), exports);
 var SerenityConfig_1 = require("./SerenityConfig");

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAyB;AACzB,6CAA2B;AAC3B,iCAAmC;AAA1B,iGAAA,QAAQ,OAAA;AACjB,+CAA6B;AAC7B,6CAA2B;AAC3B,mDAAkD;AAAzC,gHAAA,cAAc,OAAA;AACvB,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAyB;AACzB,6CAA2B;AAC3B,2BAA8B;AAArB,4FAAA,MAAM,OAAA;AACf,iCAA8C;AAArC,iGAAA,QAAQ,OAAA;AAAE,kGAAA,SAAS,OAAA;AAC5B,+CAA6B;AAC7B,6CAA2B;AAC3B,mDAAkD;AAAzC,gHAAA,cAAc,OAAA;AACvB,0CAAwB"}

package/lib/io/ErrorSerialiser.js

@@ -5,10 +5,13 @@ const serenitySpecificErrors = require("../errors");
 const json_1 = require("./json");
 class ErrorSerialiser {
     static serialise(error) {
+        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 });
+        }, { name });
         return (0, json_1.stringify)(serialisedError);
     }
     static deserialise(stringifiedError) {

package/lib/io/ErrorSerialiser.js.map

@@ -1 +1 @@
-{"version":3,"file":"ErrorSerialiser.js","sourceRoot":"","sources":["../../src/io/ErrorSerialiser.ts"],"names":[],"mappings":";;;AAEA,oDAAoD;AACpD,iCAA0C;AAyB1C,MAAa,eAAe;IAYxB,MAAM,CAAC,SAAS,CAAC,KAAY;QACzB,MAAM,eAAe,GAAG,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE;YACjF,UAAU,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAA;YAC5B,OAAO,UAAU,CAAC;QACtB,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,WAAW,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,EAAE,CAAoB,CAAC;QAEtE,OAAO,IAAA,gBAAS,EAAC,eAAe,CAAC,CAAC;IACtC,CAAC;IAED,MAAM,CAAC,WAAW,CAAkB,gBAAwB;QACxD,MAAM,eAAe,GAAG,IAAA,YAAK,EAAC,gBAAgB,CAAoB,CAAC;QAEnE,MAAM,WAAW,GAAG,eAAe,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,eAAe,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC;QACzH,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAC1D,KAAK,MAAM,QAAQ,IAAI,eAAe,EAAE;YACpC,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,EAAE;gBACjE,YAAY,CAAC,QAAQ,CAAC,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;aACtD;SACJ;QACD,OAAO,YAAY,CAAC;IACxB,CAAC;IAED,MAAM,CAAC,yBAAyB,CAAC,KAAa;QAC1C,MAAM,iBAAiB,GAAG,+CAA+C,CAAC;QAE1E,IAAI,CAAE,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YACjC,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;SACnC;QAED,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,CAAE,GAAG,KAAK,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAEtE,OAAO,eAAe,CAAC,WAAW,CAAC,IAAA,gBAAS,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IAC5F,CAAC;;AA5CL,0CA6CC;AA5CkB,gCAAgB,GAAG;IAC9B,GAAG,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;IAC9E,KAAK;IACL,SAAS;IACT,UAAU;IACV,cAAc;IACd,WAAW;IACX,SAAS;IACT,QAAQ;CACX,CAAC"}
+{"version":3,"file":"ErrorSerialiser.js","sourceRoot":"","sources":["../../src/io/ErrorSerialiser.ts"],"names":[],"mappings":";;;AAEA,oDAAoD;AACpD,iCAA0C;AAyB1C,MAAa,eAAe;IAYxB,MAAM,CAAC,SAAS,CAAC,KAAY;QACzB,MAAM,IAAI,GAAG,KAAK,IAAI,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW,CAAC,IAAI;YAC7D,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI;YACxB,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;QAEjB,MAAM,eAAe,GAAG,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE;YACjF,UAAU,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAA;YAC5B,OAAO,UAAU,CAAC;QACtB,CAAC,EAAE,EAAE,IAAI,EAAE,CAAoB,CAAC;QAEhC,OAAO,IAAA,gBAAS,EAAC,eAAe,CAAC,CAAC;IACtC,CAAC;IAED,MAAM,CAAC,WAAW,CAAkB,gBAAwB;QACxD,MAAM,eAAe,GAAG,IAAA,YAAK,EAAC,gBAAgB,CAAoB,CAAC;QAEnE,MAAM,WAAW,GAAG,eAAe,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,eAAe,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC;QACzH,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAC1D,KAAK,MAAM,QAAQ,IAAI,eAAe,EAAE;YACpC,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,EAAE;gBACjE,YAAY,CAAC,QAAQ,CAAC,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;aACtD;SACJ;QACD,OAAO,YAAY,CAAC;IACxB,CAAC;IAED,MAAM,CAAC,yBAAyB,CAAC,KAAa;QAC1C,MAAM,iBAAiB,GAAG,+CAA+C,CAAC;QAE1E,IAAI,CAAE,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YACjC,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;SACnC;QAED,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,CAAE,GAAG,KAAK,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAEtE,OAAO,eAAe,CAAC,WAAW,CAAC,IAAA,gBAAS,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IAC5F,CAAC;;AAhDL,0CAiDC;AAhDkB,gCAAgB,GAAG;IAC9B,GAAG,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;IAC9E,KAAK;IACL,SAAS;IACT,UAAU;IACV,cAAc;IACd,WAAW;IACX,SAAS;IACT,QAAQ;CACX,CAAC"}

package/lib/io/asyncMap.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @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 declare function asyncMap<Item_Type, Result_Type>(items: Item_Type[], mappingFunction: (item: Item_Type) => Promise<Result_Type> | Result_Type): Promise<Result_Type[]>;

package/lib/io/asyncMap.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.asyncMap = void 0;
+/**
+ * @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
+ */
+function asyncMap(items, mappingFunction) {
+    return items.reduce((previous, item) => previous.then(async (acc) => {
+        const result = await mappingFunction(item);
+        return acc.concat(result);
+    }), Promise.resolve([]));
+}
+exports.asyncMap = asyncMap;
+//# sourceMappingURL=asyncMap.js.map

package/lib/io/asyncMap.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"asyncMap.js","sourceRoot":"","sources":["../../src/io/asyncMap.ts"],"names":[],"mappings":";;;AAAA;;;;;;GAMG;AACH,SAAgB,QAAQ,CAAyB,KAAkB,EAAE,eAAwE;IACzI,OAAO,KAAK,CAAC,MAAM,CACf,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,CACf,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QACxB,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,CAAC;QAE3C,OAAO,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC,CAAC,EACJ,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CACxB,CAAC;AACN,CAAC;AAVD,4BAUC"}

package/lib/io/format.d.ts

@@ -0,0 +1,37 @@
+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;

package/lib/io/format.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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;
+//# 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"}

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
@@ -107,8 +133,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":"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"}
+{"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"}