@serenity-js/core 3.20.0 → 3.21.1

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.21.1](https://github.com/serenity-js/serenity-js/compare/v3.21.0...v3.21.1) (2024-03-16)
+
+
+### Bug Fixes
+
+* **core:** upgraded dependency on tiny-types to 1.22.0 ([2c0bb2a](https://github.com/serenity-js/serenity-js/commit/2c0bb2aeee7df7652853606c1ea10794157eb9fb))
+
+
+
+
+
+# [3.21.0](https://github.com/serenity-js/serenity-js/compare/v3.20.0...v3.21.0) (2024-03-04)
+
+
+### Bug Fixes
+
+* **playwright-test:** support for reporting tags registered using the new Playwright 1.42 tags API ([9d57157](https://github.com/serenity-js/serenity-js/commit/9d571573cd9d8b52ddcb286f1160c7011dea7590))
+
+
+
+
+
 # [3.20.0](https://github.com/serenity-js/serenity-js/compare/v3.19.0...v3.20.0) (2024-03-02)
 
 

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

@@ -6,5 +6,6 @@ export declare class Tags {
     private static Pattern;
     private static matchTags;
     static from(text: string): Tag[];
+    static stripFrom(text: string): string;
 }
 //# sourceMappingURL=Tags.d.ts.map

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;WAWV,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,EAAE;CAM1C"}
+{"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"}

package/lib/model/tags/Tags.js

@@ -9,12 +9,12 @@ const _1 = require("./");
 class Tags {
     static Pattern = /^@([\w-]+)[\s:]?(.*)/i;
     static matchTags(tagText) {
-        if (tagText === '')
+        if (tagText === '') {
             return [];
-        const [, type, value] = Tags.Pattern.exec(tagText);
-        return (0, tiny_types_1.match)(type.toLowerCase())
+        }
+        const [, tagType, value] = Tags.Pattern.exec(tagText);
+        return (0, tiny_types_1.match)(tagType.toLowerCase())
             .when('manual', _ => [new _1.ManualTag()])
-            // todo: map as arbitrary tag if value === ''; look up ticket id
             .when(/^issues?$/, _ => value.split(',').map(value => new _1.IssueTag(value.trim())))
             .else(value => [new _1.ArbitraryTag(value.trim())]);
     }
@@ -24,6 +24,13 @@ class Tags {
             .flatMap(tag => Tags.matchTags(tag));
         return tags ?? Tags.matchTags(text);
     }
+    static stripFrom(text) {
+        return text.split(/\s+/)
+            .map(word => Tags.Pattern.test(word) ? undefined : word)
+            .filter(Boolean)
+            .join(' ')
+            .trim();
+    }
 }
 exports.Tags = Tags;
 //# sourceMappingURL=Tags.js.map

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;YAAE,OAAO,EAAE,CAAC;QAC9B,MAAM,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEnD,OAAO,IAAA,kBAAK,EAAQ,IAAI,CAAC,WAAW,EAAE,CAAC;aAClC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,YAAS,EAAE,CAAC,CAAC;YACvC,gEAAgE;aAC/D,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,CAAC,IAAI,eAAY,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IACxD,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;;AAnBL,oBAoBC"}
+{"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;YAChB,OAAO,EAAE,CAAC;SACb;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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serenity-js/core",
-  "version": "3.20.0",
+  "version": "3.21.1",
   "description": "Serenity/JS Screenplay, reporting engine and core interfaces.",
   "author": {
     "name": "Jan Molak",
@@ -41,7 +41,7 @@
     "filenamify": "4.3.0",
     "graceful-fs": "4.2.11",
     "semver": "7.6.0",
-    "tiny-types": "1.21.0",
+    "tiny-types": "1.22.0",
     "upath": "2.0.1",
     "validate-npm-package-name": "5.0.0"
   },
@@ -71,5 +71,5 @@
   "engines": {
     "node": "^16.13 || ^18.12 || ^20"
   },
-  "gitHead": "2089afc60adb2751416fa6d800d4e7af95a99f25"
+  "gitHead": "34d2e43c9e6d504eea7c774ea8e872395cd94b98"
 }

package/src/model/tags/Tags.ts

@@ -10,20 +10,30 @@ export class Tags {
     private static Pattern = /^@([\w-]+)[\s:]?(.*)/i;
 
     private static matchTags(tagText: string): Tag[] {
-        if (tagText === '') return [];
-        const [, type, value] = Tags.Pattern.exec(tagText);
+        if (tagText === '') {
+            return [];
+        }
 
-        return match<Tag[]>(type.toLowerCase())
-            .when('manual', _ => [new ManualTag()])
-            // todo: map as arbitrary tag if value === ''; look up ticket id
+        const [ , tagType, value ] = Tags.Pattern.exec(tagText);
+
+        return match<Tag[]>(tagType.toLowerCase())
+            .when('manual', _ => [ new ManualTag() ])
             .when(/^issues?$/, _ => value.split(',').map(value => new IssueTag(value.trim())))
-            .else(value => [new ArbitraryTag(value.trim())])
+            .else(value => [ new ArbitraryTag(value.trim()) ]);
     }
 
     public static from(text: string): Tag[] {
         const tags = text.split(/\s+/)
             .filter(word => word.startsWith('@'))
             .flatMap(tag => Tags.matchTags(tag));
-        return tags ?? Tags.matchTags(text); 
+        return tags ?? Tags.matchTags(text);
+    }
+
+    public static stripFrom(text: string): string {
+        return text.split(/\s+/)
+            .map(word => Tags.Pattern.test(word) ? undefined : word)
+            .filter(Boolean)
+            .join(' ')
+            .trim();
     }
 }