@serenity-js/core 3.32.5 → 3.33.1

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.33.1](https://github.com/serenity-js/serenity-js/compare/v3.33.0...v3.33.1) (2025-07-28)
+
+
+### Bug Fixes
+
+* **core:** refactored Tag deserialiser to simplify the import graph ([ec2c333](https://github.com/serenity-js/serenity-js/commit/ec2c333ed4127d898319d0d9932d09cf545e4508))
+* **core:** support for deserialising ProjectTags ([47f650a](https://github.com/serenity-js/serenity-js/commit/47f650a026bbe812eff98dbe89658baa99371d0d))
+
+
+
+
+
 ## [3.32.5](https://github.com/serenity-js/serenity-js/compare/v3.32.4...v3.32.5) (2025-07-28)
 
 

package/lib/events/SceneTagged.d.ts

@@ -1,5 +1,5 @@
 import type { JSONObject } from 'tiny-types';
-import { CorrelationId, Tag } from '../model';
+import { CorrelationId, type Tag } from '../model';
 import { Timestamp } from '../screenplay';
 import { DomainEvent } from './DomainEvent';
 /**

package/lib/events/SceneTagged.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SceneTagged.d.ts","sourceRoot":"","sources":["../../src/events/SceneTagged.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAG7C,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C;;GAEG;AACH,qBAAa,WAAY,SAAQ,WAAW;aASpB,OAAO,EAAE,aAAa;aACtB,GAAG,EAAE,GAAG;IAT5B,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,UAAU,GAAG,WAAW;gBAQvB,OAAO,EAAE,aAAa,EACtB,GAAG,EAAE,GAAG,EACxB,SAAS,CAAC,EAAE,SAAS;CAM5B"}
+{"version":3,"file":"SceneTagged.d.ts","sourceRoot":"","sources":["../../src/events/SceneTagged.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAG7C,OAAO,EAAE,aAAa,EAAE,KAAK,GAAG,EAAQ,MAAM,UAAU,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C;;GAEG;AACH,qBAAa,WAAY,SAAQ,WAAW;aASpB,OAAO,EAAE,aAAa;aACtB,GAAG,EAAE,GAAG;IAT5B,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,UAAU,GAAG,WAAW;gBAQvB,OAAO,EAAE,aAAa,EACtB,GAAG,EAAE,GAAG,EACxB,SAAS,CAAC,EAAE,SAAS;CAM5B"}

package/lib/events/SceneTagged.js

@@ -12,7 +12,7 @@ class SceneTagged extends DomainEvent_1.DomainEvent {
     sceneId;
     tag;
     static fromJSON(o) {
-        return new SceneTagged(model_1.CorrelationId.fromJSON(o.sceneId), model_1.Tag.fromJSON(o.tag), screenplay_1.Timestamp.fromJSON(o.timestamp));
+        return new SceneTagged(model_1.CorrelationId.fromJSON(o.sceneId), model_1.Tags.fromJSON(o.tag), screenplay_1.Timestamp.fromJSON(o.timestamp));
     }
     constructor(sceneId, tag, timestamp) {
         super(timestamp);

package/lib/events/SceneTagged.js.map

@@ -1 +1 @@
-{"version":3,"file":"SceneTagged.js","sourceRoot":"","sources":["../../src/events/SceneTagged.ts"],"names":[],"mappings":";;;AACA,2CAA+C;AAE/C,oCAA8C;AAC9C,8CAA0C;AAC1C,+CAA4C;AAE5C;;GAEG;AACH,MAAa,WAAY,SAAQ,yBAAW;IASpB;IACA;IATpB,MAAM,CAAC,QAAQ,CAAC,CAAa;QACzB,OAAO,IAAI,WAAW,CAClB,qBAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAiB,CAAC,EAC3C,WAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAiB,CAAC,EACjC,sBAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAmB,CAAC,CAC5C,CAAC;IACN,CAAC;IACD,YACoB,OAAsB,EACtB,GAAQ,EACxB,SAAqB;QAErB,KAAK,CAAC,SAAS,CAAC,CAAC;QAJD,YAAO,GAAP,OAAO,CAAe;QACtB,QAAG,GAAH,GAAG,CAAK;QAIxB,IAAA,mBAAM,EAAC,SAAS,EAAE,OAAO,EAAE,IAAA,sBAAS,GAAE,CAAC,CAAC;QACxC,IAAA,mBAAM,EAAC,KAAK,EAAE,GAAG,EAAE,IAAA,sBAAS,GAAE,CAAC,CAAC;IACpC,CAAC;CACJ;AAjBD,kCAiBC"}
+{"version":3,"file":"SceneTagged.js","sourceRoot":"","sources":["../../src/events/SceneTagged.ts"],"names":[],"mappings":";;;AACA,2CAA+C;AAE/C,oCAAyD;AACzD,8CAA0C;AAC1C,+CAA4C;AAE5C;;GAEG;AACH,MAAa,WAAY,SAAQ,yBAAW;IASpB;IACA;IATpB,MAAM,CAAC,QAAQ,CAAC,CAAa;QACzB,OAAO,IAAI,WAAW,CAClB,qBAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAiB,CAAC,EAC3C,YAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAiB,CAAC,EAClC,sBAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAmB,CAAC,CAC5C,CAAC;IACN,CAAC;IACD,YACoB,OAAsB,EACtB,GAAQ,EACxB,SAAqB;QAErB,KAAK,CAAC,SAAS,CAAC,CAAC;QAJD,YAAO,GAAP,OAAO,CAAe;QACtB,QAAG,GAAH,GAAG,CAAK;QAIxB,IAAA,mBAAM,EAAC,SAAS,EAAE,OAAO,EAAE,IAAA,sBAAS,GAAE,CAAC,CAAC;QACxC,IAAA,mBAAM,EAAC,KAAK,EAAE,GAAG,EAAE,IAAA,sBAAS,GAAE,CAAC,CAAC;IACpC,CAAC;CACJ;AAjBD,kCAiBC"}

package/lib/instance.d.ts

@@ -9,10 +9,8 @@ import type { Cast } from './stage';
  */
 export declare const serenity: Serenity;
 /**
- * Configures Serenity/JS. Every call to this function
- * replaces the previous configuration provided,
- * so this function should be called exactly once
- * in your test suite.
+ * Configures Serenity/JS. Every call to this function replaces the previous configuration provided,
+ * so this function should be called exactly once in your test suite.
  *
  * This function is an alias for [`Serenity.configure`](https://serenity-js.org/api/core/class/Serenity/#configure).
  *

package/lib/instance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instance.d.ts","sourceRoot":"","sources":["../src/instance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,KAAK,EAAE,KAAK,EAAC,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAIpC;;;;GAIG;AACH,eAAO,MAAM,QAAQ,UAAsB,CAAC;AAE5C;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,SAAS,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAEtD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0GG;AACH,wBAAgB,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,CAEzC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkFG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAE/C;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAAgB,mBAAmB,IAAI,KAAK,CAE3C"}
+{"version":3,"file":"instance.d.ts","sourceRoot":"","sources":["../src/instance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,KAAK,EAAE,KAAK,EAAC,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAIpC;;;;GAIG;AACH,eAAO,MAAM,QAAQ,UAAsB,CAAC;AAE5C;;;;;;;;;;;;;GAaG;AACH,wBAAgB,SAAS,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAEtD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0GG;AACH,wBAAgB,MAAM,CAAC,MAAM,EAAE,IAAI,GAAG,IAAI,CAEzC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkFG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAE/C;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAAgB,mBAAmB,IAAI,KAAK,CAE3C"}

package/lib/instance.js

@@ -15,10 +15,8 @@ const clock = new screenplay_1.Clock();
  */
 exports.serenity = new Serenity_1.Serenity(clock);
 /**
- * Configures Serenity/JS. Every call to this function
- * replaces the previous configuration provided,
- * so this function should be called exactly once
- * in your test suite.
+ * Configures Serenity/JS. Every call to this function replaces the previous configuration provided,
+ * so this function should be called exactly once in your test suite.
  *
  * This function is an alias for [`Serenity.configure`](https://serenity-js.org/api/core/class/Serenity/#configure).
  *

package/lib/instance.js.map

@@ -1 +1 @@
-{"version":3,"file":"instance.js","sourceRoot":"","sources":["../src/instance.ts"],"names":[],"mappings":";;;AA+BA,8BAEC;AA6GD,wBAEC;AAqFD,kCAEC;AAoCD,kDAEC;AA3QD,6CAAqC;AACrC,yCAAsC;AAGtC,MAAM,KAAK,GAAG,IAAI,kBAAK,EAAE,CAAC;AAE1B;;;;GAIG;AACU,QAAA,QAAQ,GAAG,IAAI,mBAAQ,CAAC,KAAK,CAAC,CAAC;AAE5C;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,SAAS,CAAC,MAAsB;IAC5C,gBAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0GG;AACH,SAAgB,MAAM,CAAC,MAAY;IAC/B,gBAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkFG;AACH,SAAgB,WAAW,CAAC,IAAY;IACpC,OAAO,gBAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;AACzC,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,SAAgB,mBAAmB;IAC/B,OAAO,gBAAQ,CAAC,sBAAsB,EAAE,CAAC;AAC7C,CAAC"}
+{"version":3,"file":"instance.js","sourceRoot":"","sources":["../src/instance.ts"],"names":[],"mappings":";;;AA6BA,8BAEC;AA6GD,wBAEC;AAqFD,kCAEC;AAoCD,kDAEC;AAzQD,6CAAqC;AACrC,yCAAsC;AAGtC,MAAM,KAAK,GAAG,IAAI,kBAAK,EAAE,CAAC;AAE1B;;;;GAIG;AACU,QAAA,QAAQ,GAAG,IAAI,mBAAQ,CAAC,KAAK,CAAC,CAAC;AAE5C;;;;;;;;;;;;;GAaG;AACH,SAAgB,SAAS,CAAC,MAAsB;IAC5C,gBAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0GG;AACH,SAAgB,MAAM,CAAC,MAAY;IAC/B,gBAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkFG;AACH,SAAgB,WAAW,CAAC,IAAY;IACpC,OAAO,gBAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;AACzC,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,SAAgB,mBAAmB;IAC/B,OAAO,gBAAQ,CAAC,sBAAsB,EAAE,CAAC;AAC7C,CAAC"}

package/lib/model/tags/Tag.d.ts

@@ -1,4 +1,3 @@
-import type { JSONObject } from 'tiny-types';
 import { TinyType } from 'tiny-types';
 /**
  * @access public
@@ -7,7 +6,6 @@ export declare abstract class Tag extends TinyType {
     readonly name: string;
     readonly type: string;
     static humanReadable(tagConstructor: new (name: string) => Tag, tagName: string): Tag;
-    static fromJSON(o: JSONObject): Tag;
     protected constructor(name: string, type: string);
     toJSON(): {
         name: string;

package/lib/model/tags/Tag.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Tag.d.ts","sourceRoot":"","sources":["../../../src/model/tags/Tag.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAC,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAwD,QAAQ,EAAE,MAAM,YAAY,CAAC;AAI5F;;GAEG;AACH,8BAAsB,GAAI,SAAQ,QAAQ;aA0BA,IAAI,EAAE,MAAM;aAAkB,IAAI,EAAE,MAAM;IAzBhF,MAAM,CAAC,aAAa,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE,MAAM,KAAK,GAAG,EAAE,OAAO,EAAE,MAAM,GAAG,GAAG;IAarF,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,UAAU,GAAG,GAAG;IAYnC,SAAS,aAA6B,IAAI,EAAE,MAAM,EAAkB,IAAI,EAAE,MAAM;IAOhF,MAAM,IAAI;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE;CAG3C"}
+{"version":3,"file":"Tag.d.ts","sourceRoot":"","sources":["../../../src/model/tags/Tag.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8C,QAAQ,EAAE,MAAM,YAAY,CAAC;AAElF;;GAEG;AACH,8BAAsB,GAAI,SAAQ,QAAQ;aAcA,IAAI,EAAE,MAAM;aAAkB,IAAI,EAAE,MAAM;IAbhF,MAAM,CAAC,aAAa,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE,MAAM,KAAK,GAAG,EAAE,OAAO,EAAE,MAAM,GAAG,GAAG;IAarF,SAAS,aAA6B,IAAI,EAAE,MAAM,EAAkB,IAAI,EAAE,MAAM;IAOhF,MAAM,IAAI;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE;CAG3C"}

package/lib/model/tags/Tag.js

@@ -1,41 +1,7 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Tag = void 0;
 const tiny_types_1 = require("tiny-types");
-const TagTypes = __importStar(require("./index"));
 /**
  * @access public
  */
@@ -52,14 +18,6 @@ class Tag extends tiny_types_1.TinyType {
             .replaceAll(/[\s_]+/g, ' ');
         return new tagConstructor(name.charAt(0).toUpperCase() + name.slice(1));
     }
-    static fromJSON(o) {
-        const type = (0, tiny_types_1.ensure)('serialised tag type', o.type, (0, tiny_types_1.isDefined)(), (0, tiny_types_1.isString)());
-        const found = Object.keys(TagTypes).find(t => TagTypes[t].Type === type) || TagTypes.ArbitraryTag.name;
-        if (Object.prototype.hasOwnProperty.call(TagTypes[found], 'fromJSON')) {
-            return TagTypes[found].fromJSON(o);
-        }
-        return new TagTypes[found](o.name);
-    }
     constructor(name, type) {
         super();
         this.name = name;

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,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,CAAC;YACpE,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC;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":";;;AAAA,2CAAkF;AAElF;;GAEG;AACH,MAAsB,GAAI,SAAQ,qBAAQ;IAcA;IAA8B;IAbpE,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,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;AAxBD,kBAwBC"}

package/lib/model/tags/Tags.d.ts

@@ -1,10 +1,13 @@
-import type { Tag } from './';
+import type { JSONObject } from 'tiny-types';
+import type { Tag } from './Tag';
 /**
  * @package
  */
 export declare class Tags {
+    private static readonly supportedTypes;
     private static Pattern;
     private static matchTags;
+    static fromJSON(o: JSONObject): Tag;
     static from(text: string): Tag[];
     static stripFrom(text: string): string;
 }

package/lib/model/tags/Tags.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Tags.d.ts","sourceRoot":"","sources":["../../../src/model/tags/Tags.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,IAAI,CAAC;AAG9B;;GAEG;AACH,qBAAa,IAAI;IACb,OAAO,CAAC,MAAM,CAAC,OAAO,CAA2B;IAEjD,OAAO,CAAC,MAAM,CAAC,SAAS;WAaV,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,EAAE;WAOzB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;CAOhD"}
+{"version":3,"file":"Tags.d.ts","sourceRoot":"","sources":["../../../src/model/tags/Tags.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAa,MAAM,YAAY,CAAC;AAYxD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAWjC;;GAEG;AACH,qBAAa,IAAI;IACb,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAWM;IAE5C,OAAO,CAAC,MAAM,CAAC,OAAO,CAA2B;IAEjD,OAAO,CAAC,MAAM,CAAC,SAAS;IAaxB,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,UAAU,GAAG,GAAG;WAgBrB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,EAAE;WAOzB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;CAOhD"}

package/lib/model/tags/Tags.js

@@ -2,11 +2,35 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Tags = void 0;
 const tiny_types_1 = require("tiny-types");
-const _1 = require("./");
+const ArbitraryTag_1 = require("./ArbitraryTag");
+const BrowserTag_1 = require("./BrowserTag");
+const CapabilityTag_1 = require("./CapabilityTag");
+const ExecutionRetriedTag_1 = require("./ExecutionRetriedTag");
+const FeatureTag_1 = require("./FeatureTag");
+const IssueTag_1 = require("./IssueTag");
+const ManualTag_1 = require("./ManualTag");
+const PlatformTag_1 = require("./PlatformTag");
+const ProjectTag_1 = require("./ProjectTag");
+const ThemeTag_1 = require("./ThemeTag");
+function hasCustomDeserialiser(tagType) {
+    return Object.prototype.hasOwnProperty.call(tagType, 'fromJSON');
+}
 /**
  * @package
  */
 class Tags {
+    static supportedTypes = new Map([
+        ArbitraryTag_1.ArbitraryTag,
+        BrowserTag_1.BrowserTag,
+        CapabilityTag_1.CapabilityTag,
+        ExecutionRetriedTag_1.ExecutionRetriedTag,
+        FeatureTag_1.FeatureTag,
+        IssueTag_1.IssueTag,
+        ManualTag_1.ManualTag,
+        PlatformTag_1.PlatformTag,
+        ProjectTag_1.ProjectTag,
+        ThemeTag_1.ThemeTag,
+    ].map(tagType => [tagType.Type, tagType]));
     static Pattern = /^@([\w-]+)[\s:]?(.*)/i;
     static matchTags(tagText) {
         if (tagText === '') {
@@ -14,9 +38,20 @@ class Tags {
         }
         const [, tagType, value] = Tags.Pattern.exec(tagText);
         return (0, tiny_types_1.match)(tagType.toLowerCase())
-            .when('manual', _ => [new _1.ManualTag()])
-            .when(/^issues?$/, _ => value.split(',').map(value => new _1.IssueTag(value.trim())))
-            .else(value => [new _1.ArbitraryTag(value.trim())]);
+            .when('manual', _ => [new ManualTag_1.ManualTag()])
+            .when(/^issues?$/, _ => value.split(',').map(value => new IssueTag_1.IssueTag(value.trim())))
+            .else(value => [new ArbitraryTag_1.ArbitraryTag(value.trim())]);
+    }
+    static fromJSON(o) {
+        const type = (0, tiny_types_1.ensure)('serialised tag type', o.type, (0, tiny_types_1.isDefined)(), (0, tiny_types_1.isString)());
+        if (!this.supportedTypes.has(type)) {
+            return new ArbitraryTag_1.ArbitraryTag(o.name);
+        }
+        const found = this.supportedTypes.get(type);
+        if (hasCustomDeserialiser(found)) {
+            return found.fromJSON(o);
+        }
+        return new found(o.name);
     }
     static from(text) {
         const tags = text.split(/\s+/)

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

@@ -1 +1 @@
-{"version":3,"file":"Tags.js","sourceRoot":"","sources":["../../../src/model/tags/Tags.ts"],"names":[],"mappings":";;;AAAA,2CAAmC;AAGnC,yBAAuD;AAEvD;;GAEG;AACH,MAAa,IAAI;IACL,MAAM,CAAC,OAAO,GAAG,uBAAuB,CAAC;IAEzC,MAAM,CAAC,SAAS,CAAC,OAAe;QACpC,IAAI,OAAO,KAAK,EAAE,EAAE,CAAC;YACjB,OAAO,EAAE,CAAC;QACd,CAAC;QAED,MAAM,CAAE,AAAD,EAAG,OAAO,EAAE,KAAK,CAAE,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAExD,OAAO,IAAA,kBAAK,EAAQ,OAAO,CAAC,WAAW,EAAE,CAAC;aACrC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAE,IAAI,YAAS,EAAE,CAAE,CAAC;aACxC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,WAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;aACjF,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAE,IAAI,eAAY,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAE,CAAC,CAAC;IAC3D,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,IAAY;QAC3B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;aACzB,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;aACpC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QACzC,OAAO,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,IAAY;QAChC,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;aACnB,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;aACvD,MAAM,CAAC,OAAO,CAAC;aACf,IAAI,CAAC,GAAG,CAAC;aACT,IAAI,EAAE,CAAC;IAChB,CAAC;;AA7BL,oBA8BC"}
+{"version":3,"file":"Tags.js","sourceRoot":"","sources":["../../../src/model/tags/Tags.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serenity-js/core",
-  "version": "3.32.5",
+  "version": "3.33.1",
   "description": "The core Serenity/JS framework, providing the Screenplay Pattern interfaces, as well as the test reporting and integration infrastructure",
   "author": {
     "name": "Jan Molak",
@@ -75,5 +75,5 @@
   "engines": {
     "node": "^18.12 || ^20 || ^22"
   },
-  "gitHead": "21102bdb4842f85a0620e9be7c49937a8228a508"
+  "gitHead": "11bbc2bb3f6d4d5fade2b7881b36e5259973901a"
 }

package/src/events/SceneTagged.ts

@@ -1,7 +1,7 @@
 import type { JSONObject } from 'tiny-types';
 import { ensure, isDefined } from 'tiny-types';
 
-import { CorrelationId, Tag } from '../model';
+import { CorrelationId, type Tag, Tags } from '../model';
 import { Timestamp } from '../screenplay';
 import { DomainEvent } from './DomainEvent';
 
@@ -12,7 +12,7 @@ export class SceneTagged extends DomainEvent {
     static fromJSON(o: JSONObject): SceneTagged {
         return new SceneTagged(
             CorrelationId.fromJSON(o.sceneId as string),
-            Tag.fromJSON(o.tag as JSONObject),
+            Tags.fromJSON(o.tag as JSONObject),
             Timestamp.fromJSON(o.timestamp as string),
         );
     }

package/src/instance.ts

@@ -14,10 +14,8 @@ const clock = new Clock();
 export const serenity = new Serenity(clock);
 
 /**
- * Configures Serenity/JS. Every call to this function
- * replaces the previous configuration provided,
- * so this function should be called exactly once
- * in your test suite.
+ * Configures Serenity/JS. Every call to this function replaces the previous configuration provided,
+ * so this function should be called exactly once in your test suite.
  *
  * This function is an alias for [`Serenity.configure`](https://serenity-js.org/api/core/class/Serenity/#configure).
  *

package/src/model/tags/Tag.ts

@@ -1,7 +1,4 @@
-import type { JSONObject} from 'tiny-types';
-import { ensure, isDefined, isGreaterThan, isString, property, TinyType } from 'tiny-types';
-
-import * as TagTypes from './index';
+import { ensure, isDefined, isGreaterThan, property, TinyType } from 'tiny-types';
 
 /**
  * @access public
@@ -20,18 +17,6 @@ export abstract class Tag extends TinyType {
         return new tagConstructor(name.charAt(0).toUpperCase() + name.slice(1));
     }
 
-    static fromJSON(o: JSONObject): Tag {
-        const type: string = ensure('serialised tag type', o.type, isDefined(), isString()) as string;
-
-        const found = Object.keys(TagTypes).find(t => TagTypes[t].Type === type) || TagTypes.ArbitraryTag.name;
-
-        if (Object.prototype.hasOwnProperty.call(TagTypes[found], 'fromJSON')) {
-            return TagTypes[found].fromJSON(o);
-        }
-
-        return new TagTypes[found](o.name);
-    }
-
     protected constructor(public readonly name: string, public readonly type: string) {
         super();
 

package/src/model/tags/Tags.ts

@@ -1,12 +1,43 @@
-import { match } from 'tiny-types';
+import type { JSONObject, JSONValue } from 'tiny-types';
+import { ensure, isDefined, isString, match } from 'tiny-types';
 
-import type { Tag } from './';
-import { ArbitraryTag, IssueTag, ManualTag } from './';
+import { ArbitraryTag } from './ArbitraryTag';
+import { BrowserTag } from './BrowserTag';
+import { CapabilityTag } from './CapabilityTag';
+import { ExecutionRetriedTag } from './ExecutionRetriedTag';
+import { FeatureTag } from './FeatureTag';
+import { IssueTag } from './IssueTag';
+import { ManualTag } from './ManualTag';
+import { PlatformTag } from './PlatformTag';
+import { ProjectTag } from './ProjectTag';
+import type { Tag } from './Tag';
+import { ThemeTag } from './ThemeTag';
+
+interface Deserialiser<Return_Type> {
+    fromJSON(o: JSONValue): Return_Type;
+}
+
+function hasCustomDeserialiser(tagType: any): tagType is Deserialiser<Tag> {
+    return Object.prototype.hasOwnProperty.call(tagType, 'fromJSON');
+}
 
 /**
  * @package
  */
 export class Tags {
+    private static readonly supportedTypes: Map<string, Deserialiser<Tag> | { new (name: string): Tag }> = new Map([
+        ArbitraryTag,
+        BrowserTag,
+        CapabilityTag,
+        ExecutionRetriedTag,
+        FeatureTag,
+        IssueTag,
+        ManualTag,
+        PlatformTag,
+        ProjectTag,
+        ThemeTag,
+    ].map(tagType => [ tagType.Type, tagType ]))
+
     private static Pattern = /^@([\w-]+)[\s:]?(.*)/i;
 
     private static matchTags(tagText: string): Tag[] {
@@ -22,6 +53,22 @@ export class Tags {
             .else(value => [ new ArbitraryTag(value.trim()) ]);
     }
 
+    static fromJSON(o: JSONObject): Tag {
+        const type: string = ensure('serialised tag type', o.type, isDefined(), isString()) as string;
+
+        if (! this.supportedTypes.has(type)) {
+            return new ArbitraryTag(o.name as string);
+        }
+
+        const found = this.supportedTypes.get(type);
+
+        if (hasCustomDeserialiser(found)) {
+            return found.fromJSON(o);
+        }
+
+        return new found(o.name as string);
+    }
+
     public static from(text: string): Tag[] {
         const tags = text.split(/\s+/)
             .filter(word => word.startsWith('@'))