@serenity-js/web 3.4.2 → 3.6.0

package/src/screenplay/models/PageElement.ts

@@ -1,12 +1,13 @@
-import { Answerable, d, MetaQuestion, Optional, Question, QuestionAdapter } from '@serenity-js/core';
+import type { Answerable, MetaQuestion, Optional, QuestionAdapter } from '@serenity-js/core';
+import { d, Question } from '@serenity-js/core';
 import { ensure, isDefined } from 'tiny-types';
 
 import { BrowseTheWeb } from '../abilities';
-import { Locator } from './Locator';
-import { SelectOption } from './SelectOption';
-import { Selector } from './selectors';
-import { Switchable } from './Switchable';
-import { SwitchableOrigin } from './SwitchableOrigin';
+import type { Locator } from './Locator';
+import type { SelectOption } from './SelectOption';
+import type { Selector } from './selectors';
+import type { Switchable } from './Switchable';
+import type { SwitchableOrigin } from './SwitchableOrigin';
 
 /**
  * Uses the {@apilink Actor|actor's} {@apilink Ability|ability} to {@apilink BrowseTheWeb} to identify
@@ -21,6 +22,14 @@ import { SwitchableOrigin } from './SwitchableOrigin';
  */
 export abstract class PageElement<Native_Element_Type = any> implements Optional, Switchable {
 
+    static from<NET>(nativeElement: NET): QuestionAdapter<PageElement<NET>> & MetaQuestion<PageElement, PageElement> {
+        return Question.about(`native page element`, async actor => {
+            const currentPage = await BrowseTheWeb.as<BrowseTheWeb<NET>>(actor).currentPage();
+
+            return currentPage.createPageElement(nativeElement);
+        }) as QuestionAdapter<PageElement<NET>> & MetaQuestion<PageElement, PageElement>;
+    }
+
     static located<NET>(selector: Answerable<Selector>): QuestionAdapter<PageElement<NET>> & MetaQuestion<PageElement, PageElement> {
         return Question.about(d`page element located ${ selector }`, async actor => {
             const bySelector  = await actor.answer(selector);

package/src/screenplay/models/PageElements.ts

@@ -1,9 +1,10 @@
-import { Answerable, List, MetaQuestion, Question } from '@serenity-js/core';
+import type { Answerable, MetaQuestion} from '@serenity-js/core';
+import { List, Question } from '@serenity-js/core';
 
 import { BrowseTheWeb } from '../abilities';
-import { Locator } from './Locator';
-import { PageElement } from './PageElement';
-import { Selector } from './selectors';
+import type { Locator } from './Locator';
+import type { PageElement } from './PageElement';
+import type { Selector } from './selectors';
 
 /**
  * Uses the {@apilink Actor|actor's} {@apilink Ability|ability} to {@apilink BrowseTheWeb} to identify

package/src/screenplay/models/RootLocator.ts

@@ -1,4 +1,4 @@
-import { Optional } from '@serenity-js/core';
+import type { Optional } from '@serenity-js/core';
 import { inspectedObject } from '@serenity-js/core/lib/io';
 import * as util from 'util';   // eslint-disable-line unicorn/import-style
 

package/src/screenplay/models/Switchable.ts

@@ -1,4 +1,4 @@
-import { SwitchableOrigin } from './SwitchableOrigin';
+import type { SwitchableOrigin } from './SwitchableOrigin';
 
 /**
  * Describes a Serenity/JS model object that can be switched _to_ and switched back _from_

package/src/screenplay/models/dialogs/ModalDialog.ts

@@ -1,4 +1,5 @@
-import { Answerable, d, Interaction, Optional, Question, QuestionAdapter } from '@serenity-js/core';
+import type { Answerable, Interaction, Optional, Question, QuestionAdapter } from '@serenity-js/core';
+import { d } from '@serenity-js/core';
 
 import { Page } from '../Page';
 

package/src/screenplay/models/dialogs/ModalDialogHandler.ts

@@ -1,7 +1,7 @@
 import { ensure, isDefined } from 'tiny-types';
 
 import { AbsentModalDialog } from './AbsentModalDialog';
-import { ModalDialog } from './ModalDialog';
+import type { ModalDialog } from './ModalDialog';
 
 /**
  * Represent the strategy to use with any upcoming {@apilink ModalDialog} windows.

package/src/screenplay/models/selectors/By.ts

@@ -1,4 +1,5 @@
-import { Answerable, f, Question } from '@serenity-js/core';
+import type { Answerable} from '@serenity-js/core';
+import { f, Question } from '@serenity-js/core';
 
 import { ByCss } from './ByCss';
 import { ByCssContainingText } from './ByCssContainingText';

package/src/screenplay/models/selectors/Selector.ts

@@ -1,11 +1,12 @@
 import { f } from '@serenity-js/core';
+import { TinyType } from 'tiny-types';
 
 /**
  * Describes a selector you use to identify a {@apilink PageElement} or a group of {@apilink PageElements}.
  *
  * @group Models
  */
-export abstract class Selector {
+export abstract class Selector extends TinyType {
 
     toString(): string {
         const selectorDescription   = this.constructor.name.replaceAll(/([a-z])([A-Z])/g, '$1 $2').toLowerCase();

package/src/screenplay/questions/Attribute.ts

@@ -1,4 +1,5 @@
-import { Answerable, AnswersQuestions, d, LogicError, MetaQuestion, Question, QuestionAdapter, UsesAbilities } from '@serenity-js/core';
+import type { Answerable, AnswersQuestions, MetaQuestion, QuestionAdapter, UsesAbilities } from '@serenity-js/core';
+import { d, LogicError, Question } from '@serenity-js/core';
 
 import { PageElement } from '../models';
 

package/src/screenplay/questions/CssClasses.ts

@@ -1,4 +1,5 @@
-import { Answerable, AnswersQuestions, d, MetaQuestion, Question, QuestionAdapter, UsesAbilities } from '@serenity-js/core';
+import type { Answerable, AnswersQuestions, MetaQuestion, QuestionAdapter, UsesAbilities } from '@serenity-js/core';
+import { d, Question } from '@serenity-js/core';
 
 import { PageElement } from '../models';
 

package/src/screenplay/questions/LastScriptExecution.ts

@@ -1,4 +1,5 @@
-import { Question, QuestionAdapter } from '@serenity-js/core';
+import type { QuestionAdapter } from '@serenity-js/core';
+import { Question } from '@serenity-js/core';
 
 import { BrowseTheWeb } from '../abilities';
 

package/src/screenplay/questions/Selected.ts

@@ -1,6 +1,7 @@
-import { Answerable, d, Question, QuestionAdapter } from '@serenity-js/core';
+import type { Answerable, QuestionAdapter } from '@serenity-js/core';
+import { d, Question } from '@serenity-js/core';
 
-import { PageElement } from '../models';
+import type { PageElement } from '../models';
 
 /**
  * Uses the {@apilink Actor|actor's} {@apilink Ability|ability} to {@apilink BrowseTheWeb} to retrieve

package/src/screenplay/questions/Text.ts

@@ -1,4 +1,5 @@
-import { Answerable, AnswersQuestions, d, MetaQuestion, Question, QuestionAdapter, UsesAbilities } from '@serenity-js/core';
+import type { Answerable, AnswersQuestions, MetaQuestion, QuestionAdapter, UsesAbilities } from '@serenity-js/core';
+import { d, Question } from '@serenity-js/core';
 import { asyncMap } from '@serenity-js/core/lib/io';
 
 import { PageElement, PageElements } from '../models';

package/src/screenplay/questions/Value.ts

@@ -1,4 +1,5 @@
-import { Answerable, AnswersQuestions, d, MetaQuestion, Question, QuestionAdapter, UsesAbilities } from '@serenity-js/core';
+import type { Answerable, AnswersQuestions, MetaQuestion, QuestionAdapter, UsesAbilities } from '@serenity-js/core';
+import { d, Question } from '@serenity-js/core';
 
 import { PageElement } from '../models';
 

package/src/stage/crew/photographer/Photographer.ts

@@ -1,6 +1,7 @@
 import { ConfigurationError, LogicError } from '@serenity-js/core';
-import { ActivityFinished, ActivityStarts, DomainEvent } from '@serenity-js/core/lib/events';
-import { Stage, StageCrewMember } from '@serenity-js/core/lib/stage';
+import type { DomainEvent } from '@serenity-js/core/lib/events';
+import { ActivityFinished, ActivityStarts } from '@serenity-js/core/lib/events';
+import type { Stage, StageCrewMember } from '@serenity-js/core/lib/stage';
 
 import * as strategies from './strategies';
 

package/src/stage/crew/photographer/strategies/PhotoTakingStrategy.ts

@@ -1,5 +1,7 @@
-import { LogicError, Stage } from '@serenity-js/core';
-import { ActivityFinished, ActivityRelatedArtifactGenerated, ActivityStarts, AsyncOperationAborted, AsyncOperationAttempted, AsyncOperationCompleted, AsyncOperationFailed, DomainEvent } from '@serenity-js/core/lib/events';
+import type { Stage } from '@serenity-js/core';
+import { LogicError } from '@serenity-js/core';
+import type { ActivityFinished, ActivityStarts, DomainEvent } from '@serenity-js/core/lib/events';
+import { ActivityRelatedArtifactGenerated, AsyncOperationAborted, AsyncOperationAttempted, AsyncOperationCompleted, AsyncOperationFailed } from '@serenity-js/core/lib/events';
 import { CorrelationId, Description, Name, Photo } from '@serenity-js/core/lib/model';
 
 import { BrowseTheWeb } from '../../../../screenplay';

package/src/stage/crew/photographer/strategies/TakePhotosBeforeAndAfterInteractions.ts

@@ -1,4 +1,5 @@
-import { DomainEvent, InteractionFinished, InteractionStarts } from '@serenity-js/core/lib/events';
+import type { DomainEvent} from '@serenity-js/core/lib/events';
+import { InteractionFinished, InteractionStarts } from '@serenity-js/core/lib/events';
 
 import { PhotoTakingStrategy } from './PhotoTakingStrategy';
 

package/src/stage/crew/photographer/strategies/TakePhotosOfFailures.ts

@@ -1,4 +1,5 @@
-import { DomainEvent, InteractionFinished } from '@serenity-js/core/lib/events';
+import type { DomainEvent} from '@serenity-js/core/lib/events';
+import { InteractionFinished } from '@serenity-js/core/lib/events';
 import { ImplementationPending } from '@serenity-js/core/lib/model';
 
 import { PhotoTakingStrategy } from './PhotoTakingStrategy';

package/src/stage/crew/photographer/strategies/TakePhotosOfInteractions.ts

@@ -1,4 +1,5 @@
-import { DomainEvent, InteractionFinished } from '@serenity-js/core/lib/events';
+import type { DomainEvent} from '@serenity-js/core/lib/events';
+import { InteractionFinished } from '@serenity-js/core/lib/events';
 
 import { PhotoTakingStrategy } from './PhotoTakingStrategy';