@serenity-js/core 3.15.1 → 3.16.0

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.16.0](https://github.com/serenity-js/serenity-js/compare/v3.15.1...v3.16.0) (2024-02-01)
+
+
+### Bug Fixes
+
+* **core:** introduced RequirementsHierarchy to centralise requirements detection logic ([0a3d6f0](https://github.com/serenity-js/serenity-js/commit/0a3d6f013a3b94ca471edc263e1157b7c41131be))
+* **core:** recognise `specs` as a potential requirements hierarchy root ([d95d850](https://github.com/serenity-js/serenity-js/commit/d95d85058fd5e4e01aec689b7196989ece5e303f))
+* **core:** removed dependency on Moment.js ([edd1d64](https://github.com/serenity-js/serenity-js/commit/edd1d64f30893983b92bd600d102c81577c0ecb1))
+* **core:** simplified the Timestampt validation regex and improved error messages ([b453a23](https://github.com/serenity-js/serenity-js/commit/b453a23de419dbd811927b9447c17678e39f8cc8))
+* **core:** support for timezones and simplified date time strings when creating Timestamps ([754f8e2](https://github.com/serenity-js/serenity-js/commit/754f8e260d2fc5130075a78ec58084eafcf2c83f))
+
+
+### Features
+
+* **core:** added Masked.valueOf() Question ([e9ff5ab](https://github.com/serenity-js/serenity-js/commit/e9ff5ab62e8b305aa7ef2238f482be5369d890c1)), closes [#2165](https://github.com/serenity-js/serenity-js/issues/2165)
+* **mocha:** support for nested requirements reporting ([f8e70ce](https://github.com/serenity-js/serenity-js/commit/f8e70ce8a317ab6e8bdf4d058110f110b4c8deda))
+* **serenity-bdd:** upgraded Serenity BDD to 4.0.44 ([4e2f1e3](https://github.com/serenity-js/serenity-js/commit/4e2f1e3b273712c44a7f749ba9570f121520cdd5))
+
+
+
+
+
 ## [3.15.1](https://github.com/serenity-js/serenity-js/compare/v3.15.0...v3.15.1) (2024-01-19)
 
 **Note:** Version bump only for package @serenity-js/core

package/lib/io/RequirementsHierarchy.d.ts

@@ -0,0 +1,16 @@
+import { Tag } from '../model';
+import type { FileSystem } from './FileSystem';
+import { Path } from './Path';
+export declare class RequirementsHierarchy {
+    private readonly fileSystem;
+    private readonly userDefinedSpecDirectory?;
+    private root;
+    private static readonly specDirectoryCandidates;
+    constructor(fileSystem: FileSystem, userDefinedSpecDirectory?: Path);
+    requirementTagsFor(pathToSpec: Path, featureName?: string): Tag[];
+    hierarchyFor(pathToSpec: Path): string[];
+    rootDirectory(): Path;
+    private guessRootDirectory;
+    private resolve;
+}
+//# sourceMappingURL=RequirementsHierarchy.d.ts.map

package/lib/io/RequirementsHierarchy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RequirementsHierarchy.d.ts","sourceRoot":"","sources":["../../src/io/RequirementsHierarchy.ts"],"names":[],"mappings":"AACA,OAAO,EAA6B,GAAG,EAAY,MAAM,UAAU,CAAC;AACpE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,qBAAa,qBAAqB;IAc1B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAC;IAb9C,OAAO,CAAC,IAAI,CAAO;IAEnB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,uBAAuB,CAO7C;gBAGmB,UAAU,EAAE,UAAU,EACtB,wBAAwB,CAAC,EAAE,IAAI;IAIpD,kBAAkB,CAAC,UAAU,EAAE,IAAI,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,GAAG,EAAE;IAgBjE,YAAY,CAAC,UAAU,EAAE,IAAI,GAAG,MAAM,EAAE;IAiBxC,aAAa,IAAI,IAAI;IAUrB,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,OAAO;CAOlB"}

package/lib/io/RequirementsHierarchy.js

@@ -0,0 +1,76 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RequirementsHierarchy = void 0;
+const errors_1 = require("../errors");
+const model_1 = require("../model");
+const Path_1 = require("./Path");
+class RequirementsHierarchy {
+    fileSystem;
+    userDefinedSpecDirectory;
+    root;
+    static specDirectoryCandidates = [
+        `features`,
+        `specs`,
+        `spec`,
+        `tests`,
+        `test`,
+        `src`,
+    ];
+    constructor(fileSystem, userDefinedSpecDirectory) {
+        this.fileSystem = fileSystem;
+        this.userDefinedSpecDirectory = userDefinedSpecDirectory;
+    }
+    requirementTagsFor(pathToSpec, featureName) {
+        const [fileBasedFeatureName, capabilityName, ...themeNames] = this.hierarchyFor(pathToSpec).reverse().filter(segment => !['.', '..'].includes(segment));
+        const themeTags = themeNames.reverse().map(themeName => model_1.Tag.humanReadable(model_1.ThemeTag, themeName));
+        const capabilityTag = capabilityName && model_1.Tag.humanReadable(model_1.CapabilityTag, capabilityName);
+        const featureTag = featureName
+            ? new model_1.FeatureTag(featureName)
+            : model_1.Tag.humanReadable(model_1.FeatureTag, fileBasedFeatureName);
+        return [
+            ...themeTags,
+            capabilityTag,
+            featureTag
+        ].filter(Boolean);
+    }
+    hierarchyFor(pathToSpec) {
+        const relative = this.rootDirectory().relative(pathToSpec);
+        return relative.split().map((segment, i, segments) => {
+            // return all the segments as-is, except for the last one
+            if (i < segments.length - 1) {
+                return segment;
+            }
+            // Strip the extension, like `.feature` or `.spec.ts`
+            const firstDotIndex = segment.indexOf('.');
+            return firstDotIndex === -1
+                ? segment
+                : segment.slice(0, firstDotIndex);
+        });
+    }
+    rootDirectory() {
+        if (!this.root) {
+            this.root = this.userDefinedSpecDirectory
+                ? this.resolve(this.userDefinedSpecDirectory)
+                : this.guessRootDirectory();
+        }
+        return this.root;
+    }
+    guessRootDirectory() {
+        for (const candidate of RequirementsHierarchy.specDirectoryCandidates) {
+            const candidateSpecDirectory = Path_1.Path.from(candidate);
+            if (this.fileSystem.exists(Path_1.Path.from(candidate))) {
+                return this.fileSystem.resolve(candidateSpecDirectory);
+            }
+        }
+        // default to current working directory
+        return this.fileSystem.resolve(Path_1.Path.from('.'));
+    }
+    resolve(userDefinedRootDirectory) {
+        if (!this.fileSystem.exists(userDefinedRootDirectory)) {
+            throw new errors_1.ConfigurationError(`Configured specDirectory \`${userDefinedRootDirectory}\` does not exist`);
+        }
+        return this.fileSystem.resolve(userDefinedRootDirectory);
+    }
+}
+exports.RequirementsHierarchy = RequirementsHierarchy;
+//# sourceMappingURL=RequirementsHierarchy.js.map

package/lib/io/RequirementsHierarchy.js.map

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

package/lib/io/index.d.ts

@@ -10,5 +10,6 @@ export * from './inspectedObject';
 export * from './loader';
 export * from './Path';
 export * from './reflection';
+export * from './RequirementsHierarchy';
 export * from './trimmed';
 //# sourceMappingURL=index.d.ts.map

package/lib/io/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/io/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/io/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,yBAAyB,CAAC;AACxC,cAAc,WAAW,CAAC"}

package/lib/io/index.js

@@ -26,5 +26,6 @@ __exportStar(require("./inspectedObject"), exports);
 __exportStar(require("./loader"), exports);
 __exportStar(require("./Path"), exports);
 __exportStar(require("./reflection"), exports);
+__exportStar(require("./RequirementsHierarchy"), exports);
 __exportStar(require("./trimmed"), exports);
 //# sourceMappingURL=index.js.map

package/lib/io/index.js.map

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

package/lib/model/tags/Tag.js

@@ -36,7 +36,7 @@ class Tag extends tiny_types_1.TinyType {
         // based on https://github.com/serenity-bdd/serenity-core/blob/8f7d14c6dad47bb58a1585fef5f9d9a44bb963fd/serenity-model/src/main/java/net/thucydides/core/requirements/AbstractRequirementsTagProvider.java#L36
         const name = String(tagName)
             .trim()
-            .match(/[\dA-Z]{2,}(?=[A-Z][a-z]+\d*|\b)|[A-Z]?[a-z]+\d*|[A-Z]|\d+/g)
+            .match(/[\dA-Z]{2,}(?=[A-Z][a-z]+\d*|\b)|[A-Z]?[a-z-]+\d*|[A-Z]|\d+/g)
             .map(chunk => /^[A-Z]+$/.test(chunk) ? chunk : chunk.toLowerCase())
             .join('_')
             .replaceAll(/[\s_]+/g, ' ');

package/lib/model/tags/Tag.js.map

@@ -1 +1 @@
-{"version":3,"file":"Tag.js","sourceRoot":"","sources":["../../../src/model/tags/Tag.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,2CAA4F;AAE5F,kDAAoC;AAEpC;;GAEG;AACH,MAAsB,GAAI,SAAQ,qBAAQ;IA0BA;IAA8B;IAzBpE,MAAM,CAAC,aAAa,CAAC,cAAyC,EAAE,OAAe;QAC3E,8MAA8M;QAC9M,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC;aACvB,IAAI,EAAE;aACN,KAAK,CAAC,6DAA6D,CAAC;aACpE,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;aAClE,IAAI,CAAC,GAAG,CAAC;aACT,UAAU,CAAC,SAAS,EAAE,GAAG,CAAC,CAC9B;QAED,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,CAAa;QACzB,MAAM,IAAI,GAAW,IAAA,mBAAM,EAAC,qBAAqB,EAAE,CAAC,CAAC,IAAI,EAAE,IAAA,sBAAS,GAAE,EAAE,IAAA,qBAAQ,GAAE,CAAW,CAAC;QAE9F,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC;QAEvG,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,UAAU,CAAC,EAAE;YACnE,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;SACtC;QAED,OAAO,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,YAAsC,IAAY,EAAkB,IAAY;QAC5E,KAAK,EAAE,CAAC;QAD0B,SAAI,GAAJ,IAAI,CAAQ;QAAkB,SAAI,GAAJ,IAAI,CAAQ;QAG5E,IAAA,mBAAM,EAAC,UAAU,EAAE,IAAI,EAAE,IAAA,sBAAS,GAAE,EAAE,IAAA,qBAAQ,EAAC,QAAQ,EAAE,IAAA,0BAAa,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5E,IAAA,mBAAM,EAAC,UAAU,EAAE,IAAI,EAAE,IAAA,sBAAS,GAAE,EAAE,IAAA,qBAAQ,EAAC,QAAQ,EAAE,IAAA,0BAAa,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAChF,CAAC;IAED,MAAM;QACF,OAAO,KAAK,CAAC,MAAM,EAAoC,CAAC;IAC5D,CAAC;CACJ;AApCD,kBAoCC"}
+{"version":3,"file":"Tag.js","sourceRoot":"","sources":["../../../src/model/tags/Tag.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,2CAA4F;AAE5F,kDAAoC;AAEpC;;GAEG;AACH,MAAsB,GAAI,SAAQ,qBAAQ;IA0BA;IAA8B;IAzBpE,MAAM,CAAC,aAAa,CAAC,cAAyC,EAAE,OAAe;QAC3E,8MAA8M;QAC9M,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC;aACvB,IAAI,EAAE;aACN,KAAK,CAAC,8DAA8D,CAAC;aACrE,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;aAClE,IAAI,CAAC,GAAG,CAAC;aACT,UAAU,CAAC,SAAS,EAAE,GAAG,CAAC,CAC9B;QAED,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,CAAa;QACzB,MAAM,IAAI,GAAW,IAAA,mBAAM,EAAC,qBAAqB,EAAE,CAAC,CAAC,IAAI,EAAE,IAAA,sBAAS,GAAE,EAAE,IAAA,qBAAQ,GAAE,CAAW,CAAC;QAE9F,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC;QAEvG,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,UAAU,CAAC,EAAE;YACnE,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;SACtC;QAED,OAAO,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,YAAsC,IAAY,EAAkB,IAAY;QAC5E,KAAK,EAAE,CAAC;QAD0B,SAAI,GAAJ,IAAI,CAAQ;QAAkB,SAAI,GAAJ,IAAI,CAAQ;QAG5E,IAAA,mBAAM,EAAC,UAAU,EAAE,IAAI,EAAE,IAAA,sBAAS,GAAE,EAAE,IAAA,qBAAQ,EAAC,QAAQ,EAAE,IAAA,0BAAa,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5E,IAAA,mBAAM,EAAC,UAAU,EAAE,IAAI,EAAE,IAAA,sBAAS,GAAE,EAAE,IAAA,qBAAQ,EAAC,QAAQ,EAAE,IAAA,0BAAa,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAChF,CAAC;IAED,MAAM;QACF,OAAO,KAAK,CAAC,MAAM,EAAoC,CAAC;IAC5D,CAAC;CACJ;AApCD,kBAoCC"}

package/lib/screenplay/Actor.d.ts

@@ -116,10 +116,7 @@ export declare class Actor implements PerformsActivities, UsesAbilities, CanHave
      */
     answer<T>(answerable: Answerable<T>): Promise<T>;
     /**
-     * Announce collection of an {@apilink Artifact} so that it can be picked up by a {@apilink StageCrewMember}.
-     *
-     * @param artifact
-     * @param name
+     * @inheritDoc
      */
     collect(artifact: Artifact, name?: string | Name): void;
     /**

package/lib/screenplay/Actor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Actor.d.ts","sourceRoot":"","sources":["../../src/screenplay/Actor.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAC,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,IAAI,EAAG,MAAM,UAAU,CAAC;AACjC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,KAAK,EACR,WAAW,EACX,gBAAgB,EAGhB,aAAa,EAChB,MAAM,aAAa,CAAC;AACrB,OAAO,EACH,OAAO,EAGV,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0DG;AACH,qBAAa,KAAM,YAAW,kBAAkB,EAC5C,aAAa,EACb,gBAAgB,CAAC,KAAK,CAAC,EACvB,gBAAgB,EAChB,iBAAiB,EACjB,SAAS;aAKW,IAAI,EAAE,MAAM;IAC5B,OAAO,CAAC,QAAQ,CAAC,KAAK;IAJ1B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgF;gBAGtF,IAAI,EAAE,MAAM,EACX,KAAK,EAAE,KAAK,EAC7B,SAAS,GAAE,OAAO,EAAO;IAS7B;;;;;;;;;;OAUG;IACH,SAAS,CAAC,CAAC,SAAS,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;IAc5D;;;;;;OAMG;IACH,UAAU,CAAC,GAAG,UAAU,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQpD;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,GAAG,SAAS,EAAE,OAAO,EAAE,GAAG,KAAK;IAMtC;;;;;;OAMG;IACH,MAAM,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAIhD;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAUvD;;OAEG;IACH,WAAW,IAAI,SAAS;IAIxB;;;OAGG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IASxB;;;;OAIG;IACH,QAAQ,IAAI,MAAM;IAMlB,OAAO,CAAC,mBAAmB;IAc3B,OAAO,CAAC,mBAAmB;IAW3B,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,iBAAiB;IASzB;;;;;OAKG;IACH,OAAO,CAAC,QAAQ;CAKnB"}
+{"version":3,"file":"Actor.d.ts","sourceRoot":"","sources":["../../src/screenplay/Actor.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAC,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,IAAI,EAAG,MAAM,UAAU,CAAC;AACjC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,KAAK,EACR,WAAW,EACX,gBAAgB,EAGhB,aAAa,EAChB,MAAM,aAAa,CAAC;AACrB,OAAO,EACH,OAAO,EAGV,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0DG;AACH,qBAAa,KAAM,YAAW,kBAAkB,EAC5C,aAAa,EACb,gBAAgB,CAAC,KAAK,CAAC,EACvB,gBAAgB,EAChB,iBAAiB,EACjB,SAAS;aAKW,IAAI,EAAE,MAAM;IAC5B,OAAO,CAAC,QAAQ,CAAC,KAAK;IAJ1B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgF;gBAGtF,IAAI,EAAE,MAAM,EACX,KAAK,EAAE,KAAK,EAC7B,SAAS,GAAE,OAAO,EAAO;IAS7B;;;;;;;;;;OAUG;IACH,SAAS,CAAC,CAAC,SAAS,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;IAc5D;;;;;;OAMG;IACH,UAAU,CAAC,GAAG,UAAU,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQpD;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,GAAG,SAAS,EAAE,OAAO,EAAE,GAAG,KAAK;IAMtC;;;;;;OAMG;IACH,MAAM,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAIhD;;OAEG;IACH,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAUvD;;OAEG;IACH,WAAW,IAAI,SAAS;IAIxB;;;OAGG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IASxB;;;;OAIG;IACH,QAAQ,IAAI,MAAM;IAMlB,OAAO,CAAC,mBAAmB;IAc3B,OAAO,CAAC,mBAAmB;IAW3B,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,iBAAiB;IASzB;;;;;OAKG;IACH,OAAO,CAAC,QAAQ;CAKnB"}

package/lib/screenplay/Actor.js

@@ -140,10 +140,7 @@ class Actor {
         return abilities_1.AnswerQuestions.as(this).answer(answerable);
     }
     /**
-     * Announce collection of an {@apilink Artifact} so that it can be picked up by a {@apilink StageCrewMember}.
-     *
-     * @param artifact
-     * @param name
+     * @inheritDoc
      */
     collect(artifact, name) {
         this.stage.announce(new events_1.ActivityRelatedArtifactGenerated(this.stage.currentSceneId(), this.stage.currentActivityId(), this.nameFrom(name || new model_1.Name(artifact.constructor.name)), artifact, this.stage.currentTime()));

package/lib/screenplay/Actor.js.map

@@ -1 +1 @@
-{"version":3,"file":"Actor.js","sourceRoot":"","sources":["../../src/screenplay/Actor.ts"],"names":[],"mappings":";;;AAAA,sCAAqE;AACrE,sCAA6D;AAC7D,8BAA+B;AAE/B,oCAAiC;AASjC,2CAIqB;AAQrB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0DG;AACH,MAAa,KAAK;IAUM;IACC;IAJJ,SAAS,GAAuC,IAAI,GAAG,EAAiC,CAAC;IAE1G,YACoB,IAAY,EACX,KAAY,EAC7B,YAAuB,EAAE;QAFT,SAAI,GAAJ,IAAI,CAAQ;QACX,UAAK,GAAL,KAAK,CAAO;QAG7B;YACI,IAAI,6BAAiB,CAAC,IAAI,EAAE,KAAK,CAAC;YAClC,IAAI,2BAAe,CAAC,IAAI,CAAC;YACzB,GAAG,SAAS;SACf,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACvD,CAAC;IAED;;;;;;;;;;OAUG;IACH,SAAS,CAAoB,WAA2B;QACpD,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QAE9C,IAAI,CAAE,KAAK,EAAE;YACT,MAAM,IAAI,2BAAkB,CACxB,GAAI,IAAI,CAAC,IAAK,QAAS,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAE,IAAI;gBAC/F,wBAAyB,WAAW,CAAC,IAAK,QAAQ;gBAClD,yCAAyC,CAC5C,CAAC;SACL;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;;;;;OAMG;IACH,UAAU,CAAC,GAAG,UAAsB;QAChC,OAAO,UAAU;aACZ,MAAM,CAAC,CAAC,QAAuB,EAAE,OAAiB,EAAE,EAAE;YACnD,OAAO,QAAQ;iBACV,IAAI,CAAC,GAAG,EAAE,CAAC,6BAAiB,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QACjE,CAAC,EAAE,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC;IACvC,CAAC;IAED;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,GAAG,SAAoB;QAC1B,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;QAE3D,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAI,UAAyB;QAC/B,OAAO,2BAAe,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACvD,CAAC;IAED;;;;;OAKG;IACH,OAAO,CAAC,QAAkB,EAAE,IAAoB;QAC5C,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,yCAAgC,CACpD,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,EAC3B,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,EAC9B,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,IAAI,YAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAC1D,QAAQ,EACR,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAC3B,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACH,WAAW;QACP,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;IACpC,CAAC;IAED;;;OAGG;IACH,OAAO;QACH,OAAO,IAAI,CAAC,mBAAmB,CAAc,SAAS,CAAC;aAClD,MAAM,CACH,CAAC,QAAuB,EAAE,OAAgC,EAAE,EAAE,CAC1D,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,EAC1C,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CACT,CAAC;IAC3B,CAAC;IAED;;;;OAIG;IACH,QAAQ;QACJ,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAE/F,OAAO,cAAe,IAAI,CAAC,IAAK,gBAAiB,SAAS,CAAC,IAAI,CAAC,IAAI,CAAE,IAAI,CAAC;IAC/E,CAAC;IAEO,mBAAmB;QACvB,OAAO,IAAI,CAAC,mBAAmB,CAAgB,YAAY,EAAE,eAAe,CAAC;aACxE,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;aAC3C,MAAM,CACH,CAAC,QAAuB,EAAE,OAAkC,EAAE,EAAE,CAC5D,QAAQ;aACH,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;aAChC,KAAK,CAAC,KAAK,CAAC,EAAE;YACX,MAAM,IAAI,6BAAoB,CAAC,GAAI,IAAI,CAAC,IAAK,uCAAwC,OAAO,CAAC,WAAW,CAAC,IAAK,EAAE,EAAE,KAAK,CAAC,CAAC;QAC7H,CAAC,CAAC,EACV,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAC1B,CAAA;IACT,CAAC;IAEO,mBAAmB,CAAI,GAAG,WAA2B;QACzD,MAAM,aAAa,GAAG,CAAC,GAAuC,EAAa,EAAE,CACzE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;QAE7B,MAAM,2BAA2B,GAAG,CAAC,OAAoB,EAAW,EAAE,CAClE,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC;QAEjF,OAAO,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC;aAC/B,MAAM,CAAC,2BAA2B,CAAuB,CAAC;IACnE,CAAC;IAEO,aAAa,CAAoB,WAA2B;QAChE,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAExD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAM,CAAC;IAChD,CAAC;IAEO,cAAc,CAAC,OAAgB;QACnC,IAAI,CAAC,CAAC,OAAO,YAAY,mBAAO,CAAC,EAAE;YAC/B,MAAM,IAAI,2BAAkB,CAAC,2EAA4E,IAAA,WAAM,EAAC,OAAO,CAAE,EAAE,CAAC,CAAC;SAChI;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,WAAmC,CAAC,CAAC;QAExF,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC;IAEO,iBAAiB,CACrB,WAA0C;QAE1C,MAAM,UAAU,GAAG,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QACtD,OAAO,CAAC,UAAU,IAAI,UAAU,KAAK,mBAAO;YACxC,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAA;IAC5C,CAAC;IAED;;;;;OAKG;IACK,QAAQ,CAAC,SAAwB;QACrC,OAAO,OAAO,SAAS,KAAK,QAAQ;YAChC,CAAC,CAAC,IAAI,YAAI,CAAC,SAAS,CAAC;YACrB,CAAC,CAAC,SAAS,CAAC;IACpB,CAAC;CACJ;AAvMD,sBAuMC"}
+{"version":3,"file":"Actor.js","sourceRoot":"","sources":["../../src/screenplay/Actor.ts"],"names":[],"mappings":"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"}

package/lib/screenplay/artifacts/CollectsArtifacts.d.ts

@@ -13,6 +13,60 @@ export interface CollectsArtifacts {
     /**
      * Makes the {@apilink Actor} collect an {@apilink Artifact} so that it can be included in the test report.
      *
+     * #### Implementing a custom interaction to attach artifacts
+     *
+     * ```ts
+     * import * as fs from 'node:fs'
+     * import { Answerable, Interaction } from '@serenity-js/core'
+     * import { Path } from '@serenity-js/core/lib/io'
+     * import { Name, TextData } from '@serenity-js/core/lib/model'
+     *
+     * export class Attach {
+     *
+     *   static contentsOf = (pathToFile: Path): Interaction =>
+     *     Interaction.where(`#actor attaches contents of ${ pathToFile.basename() }`, async actor => {
+     *       const data = fs.readFileSync(pathToFile.value).toString('utf-8');
+     *
+     *       actor.collect(
+     *         TextData.fromJSON({ contentType: 'text/plain', data }),
+     *         new Name(pathToFile.basename()),
+     *       )
+     *     })
+     *
+     *   static textData = (contents: Answerable<string>, name?: string): Interaction =>
+     *     Interaction.where(`#actor attaches text data`, async actor => {
+     *       const data = await actor.answer(contents);
+     *
+     *       actor.collect(
+     *         TextData.fromJSON({ contentType: 'text/plain', data }),
+     *         name && new Name(name),
+     *       )
+     *     })
+     * }
+     * ```
+     *
+     * #### Attaching plain text
+     *
+     * ```ts
+     * import { actorCalled } from '@serenity-js/core'
+     * import { Path } from '@serenity-js/core/lib/io'
+     *
+     * actorCalled('Alice').attemptsTo(
+     *   Attach.textData('some text', 'some name'),
+     * )
+     * ```
+     *
+     * #### Attaching contents of a text file
+     *
+     * ```ts
+     * import { actorCalled } from '@serenity-js/core'
+     * import { Log } from '@serenity-js/core'
+     *
+     * actorCalled('Alice').attemptsTo(
+     *   Attach.contentsOf(Path.from(__dirname, 'output/server.log')),
+     * )
+     * ```
+     *
      * @param artifact
      *  The artifact to be collected, such as {@apilink JSONData}
      *

package/lib/screenplay/artifacts/CollectsArtifacts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CollectsArtifacts.d.ts","sourceRoot":"","sources":["../../../src/screenplay/artifacts/CollectsArtifacts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAElD;;;;;;;;;GASG;AACH,MAAM,WAAW,iBAAiB;IAE9B;;;;;;;;OAQG;IACH,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CAClD"}
+{"version":3,"file":"CollectsArtifacts.d.ts","sourceRoot":"","sources":["../../../src/screenplay/artifacts/CollectsArtifacts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAElD;;;;;;;;;GASG;AACH,MAAM,WAAW,iBAAiB;IAE9B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8DG;IACH,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CAClD"}

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

@@ -0,0 +1,35 @@
+import type { QuestionAdapter } from '..';
+import { type Answerable } from '..';
+/**
+ * This question masks sensitive data handled by the actors and prevents
+ * it from being shown in Serenity/JS reports and console logs.
+ * You should use it to wrap passwords, secret tokens, phone numbers,
+ * credit card numbers, or any other personally identifiable information (PII).
+ * However, even though the wrapped value is masked in the output,
+ * you can still retrieve the unmasked value by making the actor answer
+ * the question in your custom interactions.
+ *
+ * @group Questions
+ */
+export declare class Masked {
+    /**
+     * Retrieves the value of a sensitive parameter and mask it in any report.
+     *
+     * #### Example
+     *
+     * ```ts
+     * import { actorCalled, Masked } from '@serenity-js/core';
+     * import { Ensure, equals } from '@serenity-js/assertions';
+     *
+     * await actorCalled('John')
+     *   .attemptsTo(
+     *     Enter.theValue(Masked.valueOf('your little secret').into(Form.exampleInput())
+     *   );
+     * ```
+     *
+     * @param parameter - An {@link Answerable} representing the masked value.
+     * @returns A {@link QuestionAdapter} representing the masked value.
+     */
+    static valueOf(parameter: Answerable<string>): QuestionAdapter<string>;
+}
+//# sourceMappingURL=Masked.d.ts.map

package/lib/screenplay/questions/Masked.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Masked.d.ts","sourceRoot":"","sources":["../../../src/screenplay/questions/Masked.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AAC1C,OAAO,EAAE,KAAK,UAAU,EAAW,MAAM,IAAI,CAAC;AAE9C;;;;;;;;;;GAUG;AACH,qBAAa,MAAM;IAEf;;;;;;;;;;;;;;;;;OAiBG;IACH,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,MAAM,CAAC,GAAK,eAAe,CAAC,MAAM,CAAC;CAG3E"}

package/lib/screenplay/questions/Masked.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Masked = void 0;
+const __1 = require("..");
+/**
+ * This question masks sensitive data handled by the actors and prevents
+ * it from being shown in Serenity/JS reports and console logs.
+ * You should use it to wrap passwords, secret tokens, phone numbers,
+ * credit card numbers, or any other personally identifiable information (PII).
+ * However, even though the wrapped value is masked in the output,
+ * you can still retrieve the unmasked value by making the actor answer
+ * the question in your custom interactions.
+ *
+ * @group Questions
+ */
+class Masked {
+    /**
+     * Retrieves the value of a sensitive parameter and mask it in any report.
+     *
+     * #### Example
+     *
+     * ```ts
+     * import { actorCalled, Masked } from '@serenity-js/core';
+     * import { Ensure, equals } from '@serenity-js/assertions';
+     *
+     * await actorCalled('John')
+     *   .attemptsTo(
+     *     Enter.theValue(Masked.valueOf('your little secret').into(Form.exampleInput())
+     *   );
+     * ```
+     *
+     * @param parameter - An {@link Answerable} representing the masked value.
+     * @returns A {@link QuestionAdapter} representing the masked value.
+     */
+    static valueOf(parameter) {
+        return __1.Question.about('[a masked value]', async (actor) => actor.answer(parameter));
+    }
+}
+exports.Masked = Masked;
+//# sourceMappingURL=Masked.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Masked.js","sourceRoot":"","sources":["../../../src/screenplay/questions/Masked.ts"],"names":[],"mappings":";;;AACA,0BAA8C;AAE9C;;;;;;;;;;GAUG;AACH,MAAa,MAAM;IAEf;;;;;;;;;;;;;;;;;OAiBG;IACH,MAAM,CAAC,OAAO,CAAC,SAA6B;QACxC,OAAO,YAAQ,CAAC,KAAK,CAAC,kBAAkB,EAAE,KAAK,EAAC,KAAK,EAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAA;IACrF,CAAC;CACJ;AAvBD,wBAuBC"}

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

@@ -4,6 +4,7 @@ export * from './Check';
 export * from './Expectation';
 export * from './expectations';
 export * from './List';
+export * from './Masked';
 export * from './MetaQuestion';
 export * from './q';
 export * from './Unanswered';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/screenplay/questions/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,SAAS,CAAC;AACxB,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,QAAQ,CAAC;AACvB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,KAAK,CAAC;AACpB,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/screenplay/questions/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,SAAS,CAAC;AACxB,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,KAAK,CAAC;AACpB,cAAc,cAAc,CAAC"}

package/lib/screenplay/questions/index.js

@@ -20,6 +20,7 @@ __exportStar(require("./Check"), exports);
 __exportStar(require("./Expectation"), exports);
 __exportStar(require("./expectations"), exports);
 __exportStar(require("./List"), exports);
+__exportStar(require("./Masked"), exports);
 __exportStar(require("./MetaQuestion"), exports);
 __exportStar(require("./q"), exports);
 __exportStar(require("./Unanswered"), exports);

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/screenplay/questions/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,0DAAwC;AACxC,0CAAwB;AACxB,gDAA8B;AAC9B,iDAA+B;AAC/B,yCAAuB;AACvB,iDAA+B;AAC/B,sCAAoB;AACpB,+CAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/screenplay/questions/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,0DAAwC;AACxC,0CAAwB;AACxB,gDAA8B;AAC9B,iDAA+B;AAC/B,yCAAuB;AACvB,2CAAyB;AACzB,iDAA+B;AAC/B,sCAAoB;AACpB,+CAA6B"}

package/lib/screenplay/time/models/Timestamp.d.ts

@@ -16,8 +16,8 @@ import { Duration } from './Duration';
 export declare class Timestamp extends TinyType {
     readonly value: Date;
     static fromJSON(v: string): Timestamp;
-    static fromTimestampInSeconds(v: number): Timestamp;
-    static fromTimestampInMilliseconds(v: number): Timestamp;
+    static fromTimestampInSeconds(value: number): Timestamp;
+    static fromTimestampInMilliseconds(value: number): Timestamp;
     static now(): Timestamp;
     constructor(value?: Date);
     diff(another: Timestamp): Duration;

package/lib/screenplay/time/models/Timestamp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Timestamp.d.ts","sourceRoot":"","sources":["../../../../src/screenplay/time/models/Timestamp.ts"],"names":[],"mappings":";AACA,OAAO,EAA8C,QAAQ,EAAE,MAAM,YAAY,CAAC;AAClF,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC;;;;;;;;;;GAUG;AACH,qBAAa,SAAU,SAAQ,QAAQ;aAiBP,KAAK,EAAE,IAAI;IAhBvC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS;IAIrC,MAAM,CAAC,sBAAsB,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS;IAInD,MAAM,CAAC,2BAA2B,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS;IAIxD,MAAM,CAAC,GAAG,IAAI,SAAS;gBAIK,KAAK,GAAE,IAAiB;IAKpD,IAAI,CAAC,OAAO,EAAE,SAAS,GAAG,QAAQ;IAKlC,IAAI,CAAC,QAAQ,EAAE,QAAQ,GAAG,SAAS;IAKnC,IAAI,CAAC,QAAQ,EAAE,QAAQ,GAAG,SAAS;IAKnC,QAAQ,CAAC,OAAO,EAAE,SAAS,GAAG,OAAO;IAKrC,eAAe,CAAC,OAAO,EAAE,SAAS,GAAG,OAAO;IAK5C,OAAO,CAAC,OAAO,EAAE,SAAS,GAAG,OAAO;IAKpC,cAAc,CAAC,OAAO,EAAE,SAAS,GAAG,OAAO;IAK3C,cAAc,IAAI,MAAM;IAIxB,SAAS,IAAI,MAAM;IAInB,MAAM,IAAI,MAAM;IAIhB,WAAW,IAAI,MAAM;IAIrB,QAAQ,IAAI,MAAM;IAIlB,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM;CAG7B"}
+{"version":3,"file":"Timestamp.d.ts","sourceRoot":"","sources":["../../../../src/screenplay/time/models/Timestamp.ts"],"names":[],"mappings":";AAAA,OAAO,EAA8C,QAAQ,EAAE,MAAM,YAAY,CAAC;AAClF,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC;;;;;;;;;;GAUG;AACH,qBAAa,SAAU,SAAQ,QAAQ;aAiBP,KAAK,EAAE,IAAI;IAhBvC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS;IAIrC,MAAM,CAAC,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS;IAIvD,MAAM,CAAC,2BAA2B,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS;IAI5D,MAAM,CAAC,GAAG,IAAI,SAAS;gBAIK,KAAK,GAAE,IAAiB;IAKpD,IAAI,CAAC,OAAO,EAAE,SAAS,GAAG,QAAQ;IAKlC,IAAI,CAAC,QAAQ,EAAE,QAAQ,GAAG,SAAS;IAKnC,IAAI,CAAC,QAAQ,EAAE,QAAQ,GAAG,SAAS;IAKnC,QAAQ,CAAC,OAAO,EAAE,SAAS,GAAG,OAAO;IAKrC,eAAe,CAAC,OAAO,EAAE,SAAS,GAAG,OAAO;IAK5C,OAAO,CAAC,OAAO,EAAE,SAAS,GAAG,OAAO;IAKpC,cAAc,CAAC,OAAO,EAAE,SAAS,GAAG,OAAO;IAK3C,cAAc,IAAI,MAAM;IAIxB,SAAS,IAAI,MAAM;IAInB,MAAM,IAAI,MAAM;IAIhB,WAAW,IAAI,MAAM;IAIrB,QAAQ,IAAI,MAAM;IAIlB,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM;CAG7B"}

package/lib/screenplay/time/models/Timestamp.js

@@ -1,10 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Timestamp = void 0;
-const moment_1 = __importDefault(require("moment"));
 const tiny_types_1 = require("tiny-types");
 const util_1 = require("util");
 const Duration_1 = require("./Duration");
@@ -24,11 +20,11 @@ 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 fromTimestampInSeconds(v) {
-        return Timestamp.fromTimestampInMilliseconds(v * 1000);
+    static fromTimestampInSeconds(value) {
+        return Timestamp.fromTimestampInMilliseconds(value * 1000);
     }
-    static fromTimestampInMilliseconds(v) {
-        return new Timestamp((0, moment_1.default)(v).toDate());
+    static fromTimestampInMilliseconds(value) {
+        return new Timestamp(new Date(value));
     }
     static now() {
         return new Timestamp();
@@ -40,15 +36,15 @@ class Timestamp extends tiny_types_1.TinyType {
     }
     diff(another) {
         (0, tiny_types_1.ensure)('timestamp', another, (0, tiny_types_1.isDefined)());
-        return new Duration_1.Duration(Math.abs((0, moment_1.default)(this.value).diff(another.value, 'ms', true)));
+        return new Duration_1.Duration(Math.abs(this.toMilliseconds() - another.toMilliseconds()));
     }
     plus(duration) {
         (0, tiny_types_1.ensure)('duration', duration, (0, tiny_types_1.isDefined)());
-        return new Timestamp((0, moment_1.default)(this.value).add(duration.inMilliseconds(), 'ms').toDate());
+        return new Timestamp(new Date(this.toMilliseconds() + duration.inMilliseconds()));
     }
     less(duration) {
         (0, tiny_types_1.ensure)('duration', duration, (0, tiny_types_1.isDefined)());
-        return new Timestamp((0, moment_1.default)(this.value).subtract(duration.inMilliseconds(), 'ms').toDate());
+        return new Timestamp(new Date(this.toMilliseconds() - duration.inMilliseconds()));
     }
     isBefore(another) {
         (0, tiny_types_1.ensure)('timestamp', another, (0, tiny_types_1.isDefined)());
@@ -67,10 +63,10 @@ class Timestamp extends tiny_types_1.TinyType {
         return this.value.getTime() >= another.value.getTime();
     }
     toMilliseconds() {
-        return (0, moment_1.default)(this.value).valueOf();
+        return this.value.getTime();
     }
     toSeconds() {
-        return (0, moment_1.default)(this.value).unix();
+        return Math.floor(this.toMilliseconds() / 1000);
     }
     toJSON() {
         return this.value.toJSON();
@@ -86,7 +82,36 @@ class Timestamp extends tiny_types_1.TinyType {
     }
 }
 exports.Timestamp = Timestamp;
+/**
+ * Based on the implementation by Brock Adams:
+ * - https://stackoverflow.com/a/3143231/264502 by Brock Adams
+ * - https://www.w3.org/TR/NOTE-datetime
+ */
 function isSerialisedISO8601Date() {
-    return tiny_types_1.Predicate.to(`be an ISO-8601-compliant date`, (value) => (0, moment_1.default)(value, moment_1.default.ISO_8601, true).isValid());
+    const yyyyMMdd = `\\d{4}-[01]\\d-[0-3]\\d`;
+    const hh = `[0-2]\\d`;
+    const mm = `[0-5]\\d`;
+    const ss = `[0-5]\\d`;
+    const ms = `\\d+`;
+    const T = `[Tt\\s]`;
+    const offset = `[+-]${hh}:${mm}|Z`;
+    const pattern = new RegExp('^' + [
+        // Full precision - YYYY-MM-DDThh:mm:ss.sss
+        `(${yyyyMMdd}${T}${hh}:${mm}:${ss}\\.${ms}(${offset})?)`,
+        // No milliseconds - YYYY-MM-DDThh:mm:ss
+        `(${yyyyMMdd}${T}${hh}:${mm}:${ss}(${offset})?)`,
+        // No seconds - YYYY-MM-DDThh:mm
+        `(${yyyyMMdd}${T}${hh}:${mm}(${offset})?)`,
+        // Just the date - YYYY-MM-DD
+        `(${yyyyMMdd})`,
+    ].join('|') + '$');
+    return tiny_types_1.Predicate.to(`follow the ISO8601 format: YYYY-MM-DD[Thh:mm[:ss[.sss]]]`, (value) => {
+        if (!pattern.test(value)) {
+            return false;
+        }
+        const date = new Date(value);
+        return date instanceof Date
+            && !Number.isNaN(date.getTime());
+    });
 }
 //# sourceMappingURL=Timestamp.js.map

package/lib/screenplay/time/models/Timestamp.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serenity-js/core",
-  "version": "3.15.1",
+  "version": "3.16.0",
   "description": "Serenity/JS Screenplay, reporting engine and core interfaces.",
   "author": {
     "name": "Jan Molak",
@@ -40,7 +40,6 @@
     "fast-glob": "3.3.2",
     "filenamify": "4.3.0",
     "graceful-fs": "4.2.11",
-    "moment": "2.30.1",
     "semver": "7.5.4",
     "tiny-types": "1.21.0",
     "upath": "2.0.1",
@@ -72,5 +71,5 @@
   "engines": {
     "node": "^16.13 || ^18.12 || ^20"
   },
-  "gitHead": "4df79de3820acd9fb18d76843feb0468c55c8e7f"
+  "gitHead": "242771e55bd6becc5baeaac03edf945e4cdaf7a4"
 }

package/src/io/RequirementsHierarchy.ts

@@ -0,0 +1,87 @@
+import { ConfigurationError } from '../errors';
+import { CapabilityTag, FeatureTag, Tag, ThemeTag } from '../model';
+import type { FileSystem } from './FileSystem';
+import { Path } from './Path';
+
+export class RequirementsHierarchy {
+
+    private root: Path;
+
+    private static readonly specDirectoryCandidates = [
+        `features`,
+        `specs`,
+        `spec`,
+        `tests`,
+        `test`,
+        `src`,
+    ];
+
+    constructor(
+        private readonly fileSystem: FileSystem,
+        private readonly userDefinedSpecDirectory?: Path,
+    ) {
+    }
+
+    requirementTagsFor(pathToSpec: Path, featureName?: string): Tag[] {
+        const [ fileBasedFeatureName, capabilityName, ...themeNames ] = this.hierarchyFor(pathToSpec).reverse().filter(segment => !['.', '..'].includes(segment));
+
+        const themeTags = themeNames.reverse().map(themeName => Tag.humanReadable(ThemeTag, themeName));
+        const capabilityTag = capabilityName && Tag.humanReadable(CapabilityTag, capabilityName);
+        const featureTag = featureName
+            ? new FeatureTag(featureName)
+            : Tag.humanReadable(FeatureTag, fileBasedFeatureName)
+
+        return [
+            ...themeTags,
+            capabilityTag,
+            featureTag
+        ].filter(Boolean);
+    }
+
+    hierarchyFor(pathToSpec: Path): string[] {
+        const relative = this.rootDirectory().relative(pathToSpec);
+
+        return relative.split().map((segment, i, segments) => {
+            // return all the segments as-is, except for the last one
+            if (i < segments.length - 1) {
+                return segment;
+            }
+
+            // Strip the extension, like `.feature` or `.spec.ts`
+            const firstDotIndex = segment.indexOf('.');
+            return firstDotIndex === -1
+                ? segment
+                : segment.slice(0, firstDotIndex);
+        });
+    }
+
+    rootDirectory(): Path {
+        if (!this.root) {
+            this.root = this.userDefinedSpecDirectory
+                ? this.resolve(this.userDefinedSpecDirectory)
+                : this.guessRootDirectory();
+        }
+
+        return this.root;
+    }
+
+    private guessRootDirectory(): Path {
+        for (const candidate of RequirementsHierarchy.specDirectoryCandidates) {
+            const candidateSpecDirectory = Path.from(candidate);
+            if (this.fileSystem.exists(Path.from(candidate))) {
+                return this.fileSystem.resolve(candidateSpecDirectory);
+            }
+        }
+
+        // default to current working directory
+        return this.fileSystem.resolve(Path.from('.'));
+    }
+
+    private resolve(userDefinedRootDirectory: Path): Path {
+        if (!this.fileSystem.exists(userDefinedRootDirectory)) {
+            throw new ConfigurationError(`Configured specDirectory \`${ userDefinedRootDirectory }\` does not exist`);
+        }
+
+        return this.fileSystem.resolve(userDefinedRootDirectory);
+    }
+}

package/src/io/index.ts

@@ -10,4 +10,5 @@ export * from './inspectedObject';
 export * from './loader';
 export * from './Path';
 export * from './reflection';
+export * from './RequirementsHierarchy';
 export * from './trimmed';

package/src/model/tags/Tag.ts

@@ -11,7 +11,7 @@ export abstract class Tag extends TinyType {
         // based on https://github.com/serenity-bdd/serenity-core/blob/8f7d14c6dad47bb58a1585fef5f9d9a44bb963fd/serenity-model/src/main/java/net/thucydides/core/requirements/AbstractRequirementsTagProvider.java#L36
         const name = String(tagName)
             .trim()
-            .match(/[\dA-Z]{2,}(?=[A-Z][a-z]+\d*|\b)|[A-Z]?[a-z]+\d*|[A-Z]|\d+/g)
+            .match(/[\dA-Z]{2,}(?=[A-Z][a-z]+\d*|\b)|[A-Z]?[a-z-]+\d*|[A-Z]|\d+/g)
             .map(chunk => /^[A-Z]+$/.test(chunk) ? chunk : chunk.toLowerCase())
             .join('_')
             .replaceAll(/[\s_]+/g, ' ')

package/src/screenplay/Actor.ts

@@ -174,10 +174,7 @@ export class Actor implements PerformsActivities,
     }
 
     /**
-     * Announce collection of an {@apilink Artifact} so that it can be picked up by a {@apilink StageCrewMember}.
-     *
-     * @param artifact
-     * @param name
+     * @inheritDoc
      */
     collect(artifact: Artifact, name?: string | Name): void {
         this.stage.announce(new ActivityRelatedArtifactGenerated(

package/src/screenplay/artifacts/CollectsArtifacts.ts

@@ -15,6 +15,60 @@ export interface CollectsArtifacts {
     /**
      * Makes the {@apilink Actor} collect an {@apilink Artifact} so that it can be included in the test report.
      *
+     * #### Implementing a custom interaction to attach artifacts
+     *
+     * ```ts
+     * import * as fs from 'node:fs'
+     * import { Answerable, Interaction } from '@serenity-js/core'
+     * import { Path } from '@serenity-js/core/lib/io'
+     * import { Name, TextData } from '@serenity-js/core/lib/model'
+     *
+     * export class Attach {
+     *
+     *   static contentsOf = (pathToFile: Path): Interaction =>
+     *     Interaction.where(`#actor attaches contents of ${ pathToFile.basename() }`, async actor => {
+     *       const data = fs.readFileSync(pathToFile.value).toString('utf-8');
+     *
+     *       actor.collect(
+     *         TextData.fromJSON({ contentType: 'text/plain', data }),
+     *         new Name(pathToFile.basename()),
+     *       )
+     *     })
+     *
+     *   static textData = (contents: Answerable<string>, name?: string): Interaction =>
+     *     Interaction.where(`#actor attaches text data`, async actor => {
+     *       const data = await actor.answer(contents);
+     *
+     *       actor.collect(
+     *         TextData.fromJSON({ contentType: 'text/plain', data }),
+     *         name && new Name(name),
+     *       )
+     *     })
+     * }
+     * ```
+     *
+     * #### Attaching plain text
+     *
+     * ```ts
+     * import { actorCalled } from '@serenity-js/core'
+     * import { Path } from '@serenity-js/core/lib/io'
+     *
+     * actorCalled('Alice').attemptsTo(
+     *   Attach.textData('some text', 'some name'),
+     * )
+     * ```
+     *
+     * #### Attaching contents of a text file
+     *
+     * ```ts
+     * import { actorCalled } from '@serenity-js/core'
+     * import { Log } from '@serenity-js/core'
+     *
+     * actorCalled('Alice').attemptsTo(
+     *   Attach.contentsOf(Path.from(__dirname, 'output/server.log')),
+     * )
+     * ```
+     *
      * @param artifact
      *  The artifact to be collected, such as {@apilink JSONData}
      *

package/src/screenplay/questions/Masked.ts

@@ -0,0 +1,38 @@
+import type { QuestionAdapter } from '..';
+import { type Answerable,Question } from '..';
+
+/**
+ * This question masks sensitive data handled by the actors and prevents 
+ * it from being shown in Serenity/JS reports and console logs. 
+ * You should use it to wrap passwords, secret tokens, phone numbers, 
+ * credit card numbers, or any other personally identifiable information (PII). 
+ * However, even though the wrapped value is masked in the output, 
+ * you can still retrieve the unmasked value by making the actor answer
+ * the question in your custom interactions.
+ *
+ * @group Questions
+ */
+export class Masked {
+    
+    /**
+     * Retrieves the value of a sensitive parameter and mask it in any report.
+     *
+     * #### Example
+     *
+     * ```ts
+     * import { actorCalled, Masked } from '@serenity-js/core';
+     * import { Ensure, equals } from '@serenity-js/assertions';
+     *
+     * await actorCalled('John')
+     *   .attemptsTo(
+     *     Enter.theValue(Masked.valueOf('your little secret').into(Form.exampleInput())
+     *   );
+     * ```
+     *
+     * @param parameter - An {@link Answerable} representing the masked value.
+     * @returns A {@link QuestionAdapter} representing the masked value.
+     */
+    static valueOf(parameter: Answerable<string>) :  QuestionAdapter<string> {
+        return Question.about('[a masked value]', async actor => actor.answer(parameter))
+    }
+}

package/src/screenplay/questions/index.ts

@@ -4,6 +4,7 @@ export * from './Check';
 export * from './Expectation';
 export * from './expectations';
 export * from './List';
+export * from './Masked';
 export * from './MetaQuestion';
 export * from './q';
 export * from './Unanswered';

package/src/screenplay/time/models/Timestamp.ts

@@ -1,4 +1,3 @@
-import moment from 'moment';
 import { ensure, isDefined, isInstanceOf, Predicate, TinyType } from 'tiny-types';
 import { inspect } from 'util';
 
@@ -20,12 +19,12 @@ export class Timestamp extends TinyType {
         return new Timestamp(new Date(ensure(Timestamp.name, v, isSerialisedISO8601Date())));
     }
 
-    static fromTimestampInSeconds(v: number): Timestamp {
-        return Timestamp.fromTimestampInMilliseconds(v * 1000);
+    static fromTimestampInSeconds(value: number): Timestamp {
+        return Timestamp.fromTimestampInMilliseconds(value * 1000);
     }
 
-    static fromTimestampInMilliseconds(v: number): Timestamp {
-        return new Timestamp(moment(v).toDate());
+    static fromTimestampInMilliseconds(value: number): Timestamp {
+        return new Timestamp(new Date(value));
     }
 
     static now(): Timestamp {
@@ -39,17 +38,17 @@ export class Timestamp extends TinyType {
 
     diff(another: Timestamp): Duration {
         ensure('timestamp', another, isDefined());
-        return new Duration(Math.abs(moment(this.value).diff(another.value, 'ms', true)));
+        return new Duration(Math.abs(this.toMilliseconds() - another.toMilliseconds()));
     }
 
     plus(duration: Duration): Timestamp {
         ensure('duration', duration, isDefined());
-        return new Timestamp(moment(this.value).add(duration.inMilliseconds(), 'ms').toDate());
+        return new Timestamp(new Date(this.toMilliseconds() + duration.inMilliseconds()));
     }
 
     less(duration: Duration): Timestamp {
         ensure('duration', duration, isDefined());
-        return new Timestamp(moment(this.value).subtract(duration.inMilliseconds(), 'ms').toDate());
+        return new Timestamp(new Date(this.toMilliseconds() - duration.inMilliseconds()));
     }
 
     isBefore(another: Timestamp): boolean {
@@ -73,11 +72,11 @@ export class Timestamp extends TinyType {
     }
 
     toMilliseconds(): number {
-        return moment(this.value).valueOf();
+        return this.value.getTime();
     }
 
     toSeconds(): number {
-        return moment(this.value).unix();
+        return Math.floor(this.toMilliseconds() / 1_000);
     }
 
     toJSON(): string {
@@ -97,7 +96,41 @@ export class Timestamp extends TinyType {
     }
 }
 
+/**
+ * Based on the implementation by Brock Adams:
+ * - https://stackoverflow.com/a/3143231/264502 by Brock Adams
+ * - https://www.w3.org/TR/NOTE-datetime
+ */
 function isSerialisedISO8601Date(): Predicate<string> {
-    return Predicate.to(`be an ISO-8601-compliant date`, (value: string) =>
-        moment(value, moment.ISO_8601, true).isValid());
+
+    const yyyyMMdd = `\\d{4}-[01]\\d-[0-3]\\d`;
+    const hh = `[0-2]\\d`;
+    const mm = `[0-5]\\d`;
+    const ss = `[0-5]\\d`;
+    const ms = `\\d+`;
+    const T = `[Tt\\s]`;
+    const offset = `[+-]${hh}:${mm}|Z`;
+
+    const pattern = new RegExp('^' + [
+        // Full precision - YYYY-MM-DDThh:mm:ss.sss
+        `(${yyyyMMdd}${T}${hh}:${mm}:${ss}\\.${ms}(${offset})?)`,
+        // No milliseconds - YYYY-MM-DDThh:mm:ss
+        `(${yyyyMMdd}${T}${hh}:${mm}:${ss}(${offset})?)`,
+        // No seconds - YYYY-MM-DDThh:mm
+        `(${yyyyMMdd}${T}${hh}:${mm}(${offset})?)`,
+        // Just the date - YYYY-MM-DD
+        `(${yyyyMMdd})`,
+    ].join('|') + '$');
+
+    return Predicate.to(`follow the ISO8601 format: YYYY-MM-DD[Thh:mm[:ss[.sss]]]`, (value: string) => {
+
+        if (! pattern.test(value)) {
+            return false;
+        }
+
+        const date = new Date(value);
+
+        return date instanceof Date
+            && ! Number.isNaN(date.getTime());
+    });
 }