fix: component command type

iamkenos · Mar 1, 2025 · 66f8ba0 · 66f8ba0
1 parent ab557dd
commit 66f8ba0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/src/conditions/locator/locator-conditions.ts b/src/conditions/locator/locator-conditions.ts
@@ -28,10 +28,10 @@ import type { LocatorSnapshotOptions } from "@config/types";
 import type { Axis, SizeContext } from "@core/gherkin/enums";
 import type { ExpectedConditionKwargs, ExpectedConditionOptions } from "../types";
 
-export class LocatorConditions extends ExpectedConditions {
-  protected locator: Locator;
+export class LocatorConditions<T = Locator> extends ExpectedConditions {
+  protected locator: T;
 
-  constructor(locator: Locator, options?: ExpectedConditionOptions) {
+  constructor(locator: T, options?: ExpectedConditionOptions) {
     super(options);
     this.locator = locator;
   }

diff --git a/src/conditions/types.ts b/src/conditions/types.ts
@@ -6,11 +6,11 @@ export type { ExpectedConditions } from "./expected-conditions";
 
 export type { LocatorCondition } from "./locator/locator-condition";
 
-export type { LocatorConditions } from "./locator/locator-conditions";
-
 export type { PageCondition } from "./page/page-condition";
 
-export type { PageConditions } from "./page/page-conditions";
+export { LocatorConditions } from "./locator/locator-conditions";
+
+export { PageConditions } from "./page/page-conditions";
 
 export type ExpectedConditionsResult = {
   evaluations: ExpectedCondition[];

diff --git a/src/fixtures/component/component.ts b/src/fixtures/component/component.ts
@@ -118,5 +118,5 @@ export class GenericComponent {
 type This<T> = Component & T;
 type OmitLocatorKeys = "__proto";
 type OmitComponentKeys = OmitLocatorKeys | "root" | "create" | "chain";
-export type Component = Omit<GenericComponent, OmitComponentKeys> & Omit<Locator, OmitLocatorKeys>;
+export type Component = Omit<GenericComponent, OmitComponentKeys> & Locator;
 export const Component: new(selector: string, filters?: LocatorFilters) => Component = GenericComponent as any;
diff --git a/src/fixtures/locator/commands/component.ts b/src/fixtures/locator/commands/component.ts
@@ -10,4 +10,4 @@ export function component<T>(this: Locator, Component: Constructor<T>, filters?:
   return GenericComponent.create({ prototype, from }) as T;
 }
 
-export type ComponentCommand = typeof component;
+export type ComponentCommand<T> = typeof component<T>;
diff --git a/src/fixtures/locator/types.ts b/src/fixtures/locator/types.ts
@@ -42,7 +42,7 @@ export interface Locator extends PlaywrightLocator, LocatorClass {
   and(...args: Parameters<AndCommand>): ReturnType<AndCommand>;
   centerPoint(...args: Parameters<CenterPointCommand>): ReturnType<CenterPointCommand>;
   clickUntil(...args: Parameters<ClickUntilCommand>): ReturnType<ClickUntilCommand>;
-  component(...args: Parameters<ComponentCommand>): ReturnType<ComponentCommand>;
+  component<T>(...args: Parameters<ComponentCommand<T>>): ReturnType<ComponentCommand<T>>;
   doUntil(...args: Parameters<DoUntilCommand>): ReturnType<DoUntilCommand>;
   dragAndDrop(...args: Parameters<DragAndDropCommand>): ReturnType<DragAndDropCommand>;
   dropdownOptions(...args: Parameters<DropdownOptionsCommand>): ReturnType<DropdownOptionsCommand>;