@serenity-js/web 3.9.0 → 3.10.0

package/src/screenplay/questions/Value.ts

@@ -1,4 +1,4 @@
-import type { AnswersQuestions, MetaQuestion, MetaQuestionAdapter,QuestionAdapter, UsesAbilities } from '@serenity-js/core';
+import type { Answerable,MetaQuestionAdapter, QuestionAdapter } from '@serenity-js/core';
 import { d, Question } from '@serenity-js/core';
 
 import { PageElement } from '../models';
@@ -57,11 +57,7 @@ import { PageElement } from '../models';
  *
  * @group Questions
  */
-export class Value
-    extends Question<Promise<string>>
-    implements MetaQuestion<PageElement, string>
-{
-    private subject: string;
+export class Value {
 
     /**
      * Instantiates a {@apilink Question} that uses
@@ -74,50 +70,13 @@ export class Value
      * @param pageElement
      */
     static of(pageElement: QuestionAdapter<PageElement> | PageElement): MetaQuestionAdapter<PageElement, string> {
-        return Question.createAdapter(new Value(pageElement)) as MetaQuestionAdapter<PageElement, string>;
-    }
-
-    protected constructor(private readonly element: QuestionAdapter<PageElement> | PageElement) {
-        super();
-        this.subject = d`the value of ${ element }`;
-    }
-
-    /**
-     * Instantiates a {@apilink Question} that uses
-     * the {@apilink Actor|actor's} {@apilink Ability|ability} to {@apilink BrowseTheWeb} to retrieve
-     * the `value` attribute of a given {@apilink PageElement}
-     * located within the `parent` element.
-     *
-     * #### Learn more
-     * - {@apilink MetaQuestion}
-     *
-     * @param parent
-     */
-    of(parent: QuestionAdapter<PageElement> | PageElement): Question<Promise<string>> {
-        return new Value(PageElement.of(this.element, parent));
-    }
-
-    /**
-     * @inheritDoc
-     */
-    async answeredBy(actor: AnswersQuestions & UsesAbilities): Promise<string> {
-        const element = await actor.answer(this.element);
-
-        return element.value();
-    }
-
-    /**
-     * @inheritDoc
-     */
-    describedAs(subject: string): this {
-        this.subject = subject;
-        return this;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    toString(): string {
-        return this.subject;
+        return Question.about(d`the value of ${ pageElement }`,
+            async actor => {
+                const element = await actor.answer(pageElement);
+                return element.value();
+            },
+            (parent: Answerable<PageElement>) =>
+                Value.of(PageElement.of(pageElement, parent))
+        );
     }
 }