@cepharum/contextual-gherkin 1.0.1 → 1.0.2

package/lib/context.js

@@ -267,7 +267,11 @@ class Context {
 		}
 
 		const { query } = this.getSelector( "@" + name, false ) ?? {};
-		const matches = this.matches.withAttribute( query ?? name, value );
+		const matches = typeof value === "function" ? this.matches.filter( node => {
+			const actual = node.attributes.getNamedItem( name );
+
+			return value( actual == null ? undefined : actual.value );
+		}, { name: query ?? name, value } ) : this.matches.withAttribute( query ?? name, value );
 
 		return Promise.resolve( new this.constructor( this.testController, this, this.api, {
 			matches,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cepharum/contextual-gherkin",
-	"version": "1.0.1",
+	"version": "1.0.2",
 	"description": "flexible step definitions for Gherkin",
 	"main": "./index.js",
 	"types": "./index.d.ts",
@@ -24,22 +24,22 @@
 		"semver": "^7.5.0"
 	},
 	"peerDependencies": {
-		"@cucumber/cucumber": "^9.5.0",
-		"@cucumber/cucumber-expressions": "^16.1.0",
-		"gherkin-testcafe": "^7.1.0",
-		"testcafe": "~3.2.0"
+		"@cucumber/cucumber": "^10.1.0",
+		"@cucumber/cucumber-expressions": "^17.0.1",
+		"gherkin-testcafe": "^7.2.0",
+		"testcafe": "~3.5.0"
 	},
 	"devDependencies": {
-		"@cucumber/cucumber": "^9.5.0",
-		"@cucumber/cucumber-expressions": "^16.1.0",
-		"eslint": "^8.48.0",
-		"eslint-config-cepharum": "^1.0.0",
-		"eslint-plugin-promise": "^6.1.0",
-		"gherkin-testcafe": "^7.1.0",
+		"@cucumber/cucumber": "^10.1.0",
+		"@cucumber/cucumber-expressions": "^17.0.1",
+		"eslint": "^8.56.0",
+		"eslint-config-cepharum": "^1.0.14",
+		"eslint-plugin-promise": "^6.1.1",
+		"gherkin-testcafe": "^7.2.0",
 		"mocha": "^10.2.0",
-		"should": "^13.2.0",
-		"testcafe": "~3.2.0",
-		"vitepress": "^1.0.0-rc.10"
+		"should": "^13.2.3",
+		"testcafe": "~3.5.0",
+		"vitepress": "^1.0.0-rc.36"
 	},
 	"files": [
 		"lib",

package/steps/global-find.js

@@ -26,6 +26,9 @@ async function globalFind( testController, cardinal ) {
 Given( "there is/are {cardinal-word} with ID/id {text-or-regexp}", ( t, [ cardinal, id ] ) => globalFindByAttribute( t, cardinal, "id", id ) );
 Given( "there is/are {cardinal-word} with name {text-or-regexp}", ( t, [ cardinal, name ] ) => globalFindByAttribute( t, cardinal, "name", name ) );
 Given( "there is/are {cardinal-word} named {text-or-regexp}", ( t, [ cardinal, name ] ) => globalFindByAttribute( t, cardinal, "name", name ) );
+Given( "there is/are {cardinal-word} which is/are selected", ( t, [cardinal] ) => globalFindByAttribute( t, cardinal, "selected", v => v != null ) );
+Given( "there is/are {cardinal-word} which is/are not selected", ( t, [cardinal] ) => globalFindByAttribute( t, cardinal, "selected", v => v == null ) );
+Given( "there is/are {cardinal-word} which is/are unselected", ( t, [cardinal] ) => globalFindByAttribute( t, cardinal, "selected", v => v == null ) );
 
 /**
  * Searches for element(s) matching a named attribute by value.

package/steps/local-state.js

@@ -6,6 +6,9 @@ const { Api } = require( "../lib/api" );
 Then( "{contextual-word} has/have (the )ID/id {text-or-regexp}", ( t, [ context, text ] ) => localStateByAttribute( t, context, true, "id", text ) );
 Then( "{contextual-word} has/have (the )name {text-or-regexp}", ( t, [ context, text ] ) => localStateByAttribute( t, context, true, "name", text ) );
 Then( "{contextual-word} is/are named {text-or-regexp}", ( t, [ context, text ] ) => localStateByAttribute( t, context, true, "name", text ) );
+Then( "{contextual-word} is/are selected", ( t, [context] ) => localStateByAttribute( t, context, true, "selected", v => v != null ) );
+Then( "{contextual-word} is/are unselected", ( t, [context] ) => localStateByAttribute( t, context, true, "selected", v => v == null ) );
+Then( "{contextual-word} is/are not selected", ( t, [context] ) => localStateByAttribute( t, context, true, "selected", v => v == null ) );
 
 /**
  * Checks if some or all elements of an addressed match have a named attribute

package/steps/types.js

@@ -196,21 +196,18 @@ const customTypes = [
 				return new ContextualWord( formerLatter === "former" ? 1 : 0, undefined, undefined, undefined, false );
 			}
 
-			let _word = word[0] === '"' ? word.slice( 1, -1 ) : word;
-			let plural = isPlural( _word );
-
-			if ( plural ) {
-				_word = pluralize.singular( _word );
-			}
+			const originalWord = word[0] === '"' ? word.slice( 1, -1 ) : word;
+			let plural = isPlural( originalWord );
+			const normalizedWord = plural ? pluralize.singular( originalWord ) : originalWord;
 
 			if ( thisThat != null ) {
 				if ( plural != null && plural !== [ "these", "those" ].includes( thisThat ) ) {
-					console.warn( `ambiguous cardinality expressed in phrase "${thisThat} ${_word}"` );
+					console.warn( `ambiguous cardinality expressed in phrase "${thisThat} ${originalWord}"` );
 
 					plural = undefined;
 				}
 
-				return new ContextualWord( [ "this", "these" ].includes( thisThat ) ? 0 : 1, _word, plural, undefined, false );
+				return new ContextualWord( [ "this", "these" ].includes( thisThat ) ? 0 : 1, normalizedWord, plural, undefined, false );
 			}
 
 			if ( ordinal != null ) {
@@ -219,7 +216,7 @@ const customTypes = [
 						throw new TypeError( "invalid combination of former/latter with scoping reference" );
 					}
 
-					return new ContextualWord( ordinal === "former" ? 1 : 0, _word, plural, undefined, false );
+					return new ContextualWord( ordinal === "former" ? 1 : 0, normalizedWord, plural, undefined, false );
 				}
 
 				const subIndex = ( Ordinals[ordinal] ?? parseInt( ordinal, 10 ) ) - 1;
@@ -238,10 +235,10 @@ const customTypes = [
 						break;
 				}
 
-				return new ContextualWord( index, _word, plural, subIndex, true );
+				return new ContextualWord( index, normalizedWord, plural, subIndex, true );
 			}
 
-			return new ContextualWord( 0, _word, plural, undefined, false );
+			return new ContextualWord( 0, normalizedWord, plural, undefined, false );
 		},
 	} ),