@serenity-js/core 3.16.2 → 3.18.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.18.0](https://github.com/serenity-js/serenity-js/compare/v3.17.0...v3.18.0) (2024-02-17)
+
+
+### Bug Fixes
+
+* **deps:** update dependency diff to v5.2.0 ([17f5a2e](https://github.com/serenity-js/serenity-js/commit/17f5a2e61576bae958f1f30490da8b24351d08f8))
+
+
+
+
+
+# [3.17.0](https://github.com/serenity-js/serenity-js/compare/v3.16.2...v3.17.0) (2024-02-10)
+
+
+### Bug Fixes
+
+* **playwright-test:** fix lint issue, refactors and add integration tests to custom tags reporting ([0f055c7](https://github.com/serenity-js/serenity-js/commit/0f055c7f4e0a9f6d29ef20c615c2055baebf85ec))
+
+
+
+
+
 ## [3.16.2](https://github.com/serenity-js/serenity-js/compare/v3.16.1...v3.16.2) (2024-02-05)
 
 **Note:** Version bump only for package @serenity-js/core

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

@@ -4,6 +4,7 @@ import type { Tag } from './';
  */
 export declare class Tags {
     private static Pattern;
+    private static matchTags;
     static from(text: string): Tag[];
 }
 //# 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,CAA4B;WAEpC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,EAAE;CAS1C"}
+{"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"}

package/lib/model/tags/Tags.js

@@ -8,14 +8,22 @@ const _1 = require("./");
  */
 class Tags {
     static Pattern = /^@([\w-]+)[\s:]?(.*)/i;
-    static from(text) {
-        const [, type, value] = Tags.Pattern.exec(text);
+    static matchTags(tagText) {
+        if (tagText === '')
+            return [];
+        const [, type, value] = Tags.Pattern.exec(tagText);
         return (0, tiny_types_1.match)(type.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())]);
     }
+    static from(text) {
+        const tags = text.split(/\s+/)
+            .filter(word => word.startsWith('@'))
+            .flatMap(tag => Tags.matchTags(tag));
+        return tags ?? Tags.matchTags(text);
+    }
 }
 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,CAAE;IAE3C,MAAM,CAAC,IAAI,CAAC,IAAY;QAC3B,MAAM,CAAE,AAAD,EAAG,IAAI,EAAE,KAAK,CAAE,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAElD,OAAO,IAAA,kBAAK,EAAQ,IAAI,CAAC,WAAW,EAAE,CAAC;aAClC,IAAI,CAAC,QAAQ,EAAM,CAAC,CAAC,EAAE,CAAC,CAAE,IAAI,YAAS,EAAE,CAAE,CAAC;YAC7C,gEAAgE;aAC/D,IAAI,CAAC,WAAW,EAAG,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;aAClF,IAAI,CAAC,KAAK,CAAW,EAAE,CAAC,CAAE,IAAI,eAAY,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAE,CAAC,CAAC;IACrE,CAAC;;AAXL,oBAYC"}
+{"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"}

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

@@ -23,7 +23,7 @@ export declare class Masked {
      *
      * await actorCalled('John')
      *   .attemptsTo(
-     *     Enter.theValue(Masked.valueOf('your little secret').into(Form.exampleInput())
+     *     Enter.theValue(Masked.valueOf('your little secret')).into(Form.exampleInput())
      *   );
      * ```
      *

package/lib/screenplay/questions/Masked.js

@@ -25,7 +25,7 @@ class Masked {
      *
      * await actorCalled('John')
      *   .attemptsTo(
-     *     Enter.theValue(Masked.valueOf('your little secret').into(Form.exampleInput())
+     *     Enter.theValue(Masked.valueOf('your little secret')).into(Form.exampleInput())
      *   );
      * ```
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serenity-js/core",
-  "version": "3.16.2",
+  "version": "3.18.0",
   "description": "Serenity/JS Screenplay, reporting engine and core interfaces.",
   "author": {
     "name": "Jan Molak",
@@ -35,12 +35,12 @@
   "dependencies": {
     "@paralleldrive/cuid2": "2.2.2",
     "chalk": "4.1.2",
-    "diff": "5.1.0",
+    "diff": "5.2.0",
     "error-stack-parser": "2.1.4",
     "fast-glob": "3.3.2",
     "filenamify": "4.3.0",
     "graceful-fs": "4.2.11",
-    "semver": "7.5.4",
+    "semver": "7.6.0",
     "tiny-types": "1.21.0",
     "upath": "2.0.1",
     "validate-npm-package-name": "5.0.0"
@@ -50,12 +50,12 @@
     "@types/diff": "5.0.9",
     "@types/filenamify": "2.0.2",
     "@types/mocha": "10.0.6",
-    "@types/semver": "7.5.6",
+    "@types/semver": "7.5.7",
     "@types/validate-npm-package-name": "4.0.2",
     "assertion-error-formatter": "3.0.0",
     "c8": "9.1.0",
-    "memfs": "4.6.0",
-    "mocha": "10.2.0",
+    "memfs": "4.7.1",
+    "mocha": "10.3.0",
     "mocha-multi": "1.1.7",
     "ts-node": "10.9.2",
     "typescript": "5.2.2"
@@ -71,5 +71,5 @@
   "engines": {
     "node": "^16.13 || ^18.12 || ^20"
   },
-  "gitHead": "d24b15b34b550b0a9b2541529e8d1f92a30f8944"
+  "gitHead": "c4f12cc2dd366788b88fd06b4452084a6b36b5fe"
 }

package/src/model/tags/Tags.ts

@@ -7,15 +7,23 @@ import { ArbitraryTag, IssueTag, ManualTag } from './';
  * @package
  */
 export class Tags {
-    private static Pattern = /^@([\w-]+)[\s:]?(.*)/i ;
+    private static Pattern = /^@([\w-]+)[\s:]?(.*)/i;
 
-    public static from(text: string): Tag[] {
-        const [ , type, value ] = Tags.Pattern.exec(text);
+    private static matchTags(tagText: string): Tag[] {
+        if (tagText === '') return [];
+        const [, type, value] = Tags.Pattern.exec(tagText);
 
         return match<Tag[]>(type.toLowerCase())
-            .when('manual',     _ => [ new ManualTag() ])
+            .when('manual', _ => [new ManualTag()])
             // todo: map as arbitrary tag if value === ''; look up ticket id
-            .when(/^issues?$/,  _ => value.split(',').map(value => new IssueTag(value.trim())))
-            .else(value           => [ new ArbitraryTag(value.trim()) ]);
+            .when(/^issues?$/, _ => value.split(',').map(value => new IssueTag(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); 
     }
 }

package/src/screenplay/questions/Masked.ts

@@ -25,7 +25,7 @@ export class Masked {
      *
      * await actorCalled('John')
      *   .attemptsTo(
-     *     Enter.theValue(Masked.valueOf('your little secret').into(Form.exampleInput())
+     *     Enter.theValue(Masked.valueOf('your little secret')).into(Form.exampleInput())
      *   );
      * ```
      *